diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-05 20:31:14 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-05 20:31:14 -0400 |
| commit | bb896afe2089575ca1bb1fbf3f07b934e1ba999b (patch) | |
| tree | 7300f9b4e3e267fe97d898440c72ff2c4c327f23 /arch/x86 | |
| parent | 2e83fc4df5f27dfc1b53044c4f142b2f9d1db08c (diff) | |
| parent | aac6abca858386438d9a7233c3471d2ecfa2f704 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-fixes
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-fixes:
sched: default to n for GROUP_SCHED and FAIR_GROUP_SCHED
sched: add optional support for CONFIG_HAVE_UNSTABLE_SCHED_CLOCK
sched, x86: add HAVE_UNSTABLE_SCHED_CLOCK
sched: fix cpu clock
sched: fair-group: fix a Div0 error of the fair group scheduler
sched: fix missing locking in sched_domains code
sched: make clock sync tunable by architecture code
sched: fix debugging
sched: fix sched_info_switch not being called according to documentation
sched: fix hrtick_start_fair and CPU-Hotplug
sched: fix SCHED_FAIR wake-idle logic error
sched: fix RT task-wakeup logic
sched: add statics, don't return void expressions
sched: add debug checks to idle functions
sched: remove old sched doc
sched: make rt_sched_class, idle_sched_class static
sched: optimize calc_delta_mine()
sched: fix normalized sleeper
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 845ea2b2d487..bbcafaa160c0 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
| @@ -18,6 +18,7 @@ config X86_64 | |||
| 18 | ### Arch settings | 18 | ### Arch settings |
| 19 | config X86 | 19 | config X86 |
| 20 | def_bool y | 20 | def_bool y |
| 21 | select HAVE_UNSTABLE_SCHED_CLOCK | ||
| 21 | select HAVE_IDE | 22 | select HAVE_IDE |
| 22 | select HAVE_OPROFILE | 23 | select HAVE_OPROFILE |
| 23 | select HAVE_KPROBES | 24 | select HAVE_KPROBES |