diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-26 11:15:03 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-26 11:15:03 -0400 |
| commit | 39adff5f69d6849ca22353a88058c9f8630528c0 (patch) | |
| tree | b0c2d2de77ebc5c97fd19c29b81eeb03549553f8 /arch/x86/Kconfig | |
| parent | 8a4a8918ed6e4a361f4df19f199bbc2d0a89a46c (diff) | |
| parent | e35f95b36e43f67a6f806172555a152c11ea0a78 (diff) | |
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
* 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (23 commits)
time, s390: Get rid of compile warning
dw_apb_timer: constify clocksource name
time: Cleanup old CONFIG_GENERIC_TIME references that snuck in
time: Change jiffies_to_clock_t() argument type to unsigned long
alarmtimers: Fix error handling
clocksource: Make watchdog reset lockless
posix-cpu-timers: Cure SMP accounting oddities
s390: Use direct ktime path for s390 clockevent device
clockevents: Add direct ktime programming function
clockevents: Make minimum delay adjustments configurable
nohz: Remove "Switched to NOHz mode" debugging messages
proc: Consider NO_HZ when printing idle and iowait times
nohz: Make idle/iowait counter update conditional
nohz: Fix update_ts_time_stat idle accounting
cputime: Clean up cputime_to_usecs and usecs_to_cputime macros
alarmtimers: Rework RTC device selection using class interface
alarmtimers: Add try_to_cancel functionality
alarmtimers: Add more refined alarm state tracking
alarmtimers: Remove period from alarm structure
alarmtimers: Remove interval cap limit hack
...
Diffstat (limited to 'arch/x86/Kconfig')
| -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 9037289617ac..e022f82cd0d0 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
| @@ -68,6 +68,7 @@ config X86 | |||
| 68 | select GENERIC_IRQ_PROBE | 68 | select GENERIC_IRQ_PROBE |
| 69 | select GENERIC_PENDING_IRQ if SMP | 69 | select GENERIC_PENDING_IRQ if SMP |
| 70 | select GENERIC_IRQ_SHOW | 70 | select GENERIC_IRQ_SHOW |
| 71 | select GENERIC_CLOCKEVENTS_MIN_ADJUST | ||
| 71 | select IRQ_FORCED_THREADING | 72 | select IRQ_FORCED_THREADING |
| 72 | select USE_GENERIC_SMP_HELPERS if SMP | 73 | select USE_GENERIC_SMP_HELPERS if SMP |
| 73 | select HAVE_BPF_JIT if (X86_64 && NET) | 74 | select HAVE_BPF_JIT if (X86_64 && NET) |