aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-02-01 16:27:00 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2008-02-01 16:27:00 -0500
commit45f37e86f1ef95f002386d8a0ab508407cec9bf3 (patch)
treeaeae54129b9a440b2d1d80a80d84070a91e83c9c /arch
parente30ec4525d4731d828a754823a83a3d6b50bb230 (diff)
parentaa7d93506cc26378be6964692cd0dd34cffaee25 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched
* git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched: latencytop: Change Kconfig dependency. futex: Add bitset conditional wait/wakeup functionality futex: Remove warn on in return fixup path x86: replace LOCK_PREFIX in futex.h tick-sched: add more debug information timekeeping: update xtime_cache when time(zone) changes hrtimer: fix hrtimer_init_sleeper() users
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/Kconfig3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 65b449134cf7..93e66678e158 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -44,6 +44,9 @@ config LOCKDEP_SUPPORT
44config STACKTRACE_SUPPORT 44config STACKTRACE_SUPPORT
45 def_bool y 45 def_bool y
46 46
47config HAVE_LATENCYTOP_SUPPORT
48 def_bool y
49
47config SEMAPHORE_SLEEPERS 50config SEMAPHORE_SLEEPERS
48 def_bool y 51 def_bool y
49 52