diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-29 23:35:01 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-29 23:35:01 -0400 |
| commit | 6ffc1fee98c4b995eb3a0285f4f8fb467cb0306e (patch) | |
| tree | 69a05892a41e7f7400fa598ee0bdf8027c8f0fd6 /Makefile | |
| parent | e40152ee1e1c7a63f4777791863215e3faa37a86 (diff) | |
| parent | 7c1ff4c544dd650cceff3cd69a04bcba60856678 (diff) | |
Merge branch 'master' into wip-merge-2.6.34
Simple merge between master and 2.6.34 with conflicts resolved.
This commit does not compile, the following main problems are still
unresolved:
- spinlock -> raw_spinlock API changes
- kfifo API changes
- sched_class API changes
Conflicts:
Makefile
arch/x86/include/asm/hw_irq.h
arch/x86/include/asm/unistd_32.h
arch/x86/kernel/syscall_table_32.S
include/linux/hrtimer.h
kernel/sched.c
kernel/sched_fair.c
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
| @@ -1,7 +1,7 @@ | |||
| 1 | VERSION = 2 | 1 | VERSION = 2 |
| 2 | PATCHLEVEL = 6 | 2 | PATCHLEVEL = 6 |
| 3 | SUBLEVEL = 34 | 3 | SUBLEVEL = 34 |
| 4 | EXTRAVERSION = | 4 | EXTRAVERSION =-litmus2010 |
| 5 | NAME = Sheep on Meth | 5 | NAME = Sheep on Meth |
| 6 | 6 | ||
| 7 | # *DOCUMENTATION* | 7 | # *DOCUMENTATION* |
| @@ -650,7 +650,7 @@ export mod_strip_cmd | |||
| 650 | 650 | ||
| 651 | 651 | ||
| 652 | ifeq ($(KBUILD_EXTMOD),) | 652 | ifeq ($(KBUILD_EXTMOD),) |
| 653 | core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/ | 653 | core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/ litmus/ |
| 654 | 654 | ||
| 655 | vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \ | 655 | vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \ |
| 656 | $(core-y) $(core-m) $(drivers-y) $(drivers-m) \ | 656 | $(core-y) $(core-m) $(drivers-y) $(drivers-m) \ |