starred/linux-legacy
1
0
Fork 0
mirror of https://github.com/genesi/linux-legacy.git synced 2026-05-17 15:31:57 +00:00
Code Issues 2 Packages Projects Releases Wiki Activity

Merge commit 'v2.6.29-rc2' into perfcounters/core

Browse Source 
Conflicts:
	include/linux/syscalls.h
This commit is contained in:
Ingo Molnar
2009-01-21 16:37:27 +01:00
parent af37501c79 1de9e8e70f
commit 77835492ed
524 changed files with 7980 additions and 3545 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
kernel/Makefile
View File

@@ -40,9 +40,8 @@ obj-$(CONFIG_RT_MUTEXES) += rtmutex.o
obj-$(CONFIG_DEBUG_RT_MUTEXES) += rtmutex-debug.o
obj-$(CONFIG_RT_MUTEX_TESTER) += rtmutex-tester.o
obj-$(CONFIG_GENERIC_ISA_DMA) += dma.o
ifeq ($(CONFIG_USE_GENERIC_SMP_HELPERS),y)
obj-y += smp.o
else
obj-$(CONFIG_USE_GENERIC_SMP_HELPERS) += smp.o
ifneq ($(CONFIG_SMP),y)
obj-y += up.o
endif
obj-$(CONFIG_SMP) += spinlock.o