Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 May 2012 20:29:46 +0000 (13:29 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 May 2012 20:29:46 +0000 (13:29 -0700)
Pull timer updates from Thomas Gleixner.

Various trivial conflict fixups in arch Kconfig due to addition of
unrelated entries nearby.  And one slightly more subtle one for sparc32
(new user of GENERIC_CLOCKEVENTS), fixed up as per Thomas.

* 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (31 commits)
  timekeeping: Fix a few minor newline issues.
  time: remove obsolete declaration
  ntp: Fix a stale comment and a few stray newlines.
  ntp: Correct TAI offset during leap second
  timers: Fixup the Kconfig consolidation fallout
  x86: Use generic time config
  unicore32: Use generic time config
  um: Use generic time config
  tile: Use generic time config
  sparc: Use: generic time config
  sh: Use generic time config
  score: Use generic time config
  s390: Use generic time config
  openrisc: Use generic time config
  powerpc: Use generic time config
  mn10300: Use generic time config
  mips: Use generic time config
  microblaze: Use generic time config
  m68k: Use generic time config
  m32r: Use generic time config
  ...

17 files changed:
1  2 
arch/alpha/Kconfig
arch/arm/Kconfig
arch/blackfin/Kconfig
arch/c6x/Kconfig
arch/cris/Kconfig
arch/hexagon/Kconfig
arch/ia64/Kconfig
arch/mips/Kconfig
arch/openrisc/Kconfig
arch/powerpc/Kconfig
arch/s390/Kconfig
arch/sh/Kconfig
arch/sparc/Kconfig
arch/tile/Kconfig
arch/um/Kconfig.common
arch/x86/Kconfig
init/Kconfig

index 0893f023efb8895ed19b40d501f6977f341f8024,77ba2680a74955d403f4641679d000156f511402..3de74c9f961093ebbb7d87162ed6a6c3c96053d8
@@@ -15,7 -15,7 +15,8 @@@ config ALPH
        select GENERIC_IRQ_SHOW
        select ARCH_WANT_OPTIONAL_GPIOLIB
        select ARCH_HAVE_NMI_SAFE_CMPXCHG
 +      select GENERIC_SMP_IDLE_THREAD
+       select GENERIC_CMOS_UPDATE
        help
          The Alpha is a 64-bit general-purpose processor designed and
          marketed by the Digital Equipment Corporation of blessed memory,
index 4f4c8115d79b21476892e1dc0df5f90ac0f51178,c1e5f07fab938742a5d1b2742b089ceec3e82aab..312450941a1a6ed007b00f306b4cf321a2dae1ee
@@@ -31,15 -30,12 +31,17 @@@ config AR
        select HAVE_HW_BREAKPOINT if (PERF_EVENTS && (CPU_V6 || CPU_V6K || CPU_V7))
        select HAVE_C_RECORDMCOUNT
        select HAVE_GENERIC_HARDIRQS
 +      select HARDIRQS_SW_RESEND
 +      select GENERIC_IRQ_PROBE
        select GENERIC_IRQ_SHOW
 +      select GENERIC_IRQ_PROBE
 +      select HARDIRQS_SW_RESEND
        select CPU_PM if (SUSPEND || CPU_IDLE)
        select GENERIC_PCI_IOMAP
 -      select HAVE_BPF_JIT if NET
 +      select HAVE_BPF_JIT
 +      select GENERIC_SMP_IDLE_THREAD
+       select KTIME_SCALAR
+       select GENERIC_CLOCKEVENTS_BROADCAST if SMP
        help
          The ARM series is a line of low-power-consumption RISC chip designs
          licensed by ARM Ltd and targeted at embedded applications and
index 79cfe2614bcc871f7faff8fd8c0d6f2c02b54fe8,f7897eefa630515b79b1446ffdefc4930d2e0435..04ec0d8fbbb5bee2814d5ed324e36509476429a5
@@@ -37,7 -37,7 +37,8 @@@ config BLACKFI
        select GENERIC_IRQ_PROBE
        select IRQ_PER_CPU if SMP
        select HAVE_NMI_WATCHDOG if NMI_WATCHDOG
 +      select GENERIC_SMP_IDLE_THREAD
+       select ARCH_USES_GETTIMEOFFSET if !GENERIC_CLOCKEVENTS
  
  config GENERIC_CSUM
        def_bool y
Simple merge
index 2995035812eccaf8b80f3d889470626dee7f36e2,4a63e7eca1054b690453e4015a1e8ad90221692f..22d34d64cc81d014ef39e793f14dc1b28d105655
@@@ -49,7 -43,7 +43,8 @@@ config CRI
        select HAVE_GENERIC_HARDIRQS
        select GENERIC_IRQ_SHOW
        select GENERIC_IOMAP
 +      select GENERIC_SMP_IDLE_THREAD if ETRAX_ARCH_V32
+       select GENERIC_CMOS_UPDATE
  
  config HZ
        int
index bc979f770980ae4a286b8833980ee4be542aa985,35f6c32d040cbb25eb8976ea6d589e5904f651da..b2fdfb700f505d2e7afeb4e8ddc92d88528f7fbb
@@@ -25,8 -27,10 +25,11 @@@ config HEXAGO
        select HAVE_ARCH_TRACEHOOK
        select NO_IOPORT
        select GENERIC_IOMAP
 -      # mostly generic routines, with some accelerated ones
 +      select GENERIC_SMP_IDLE_THREAD
 +      select STACKTRACE_SUPPORT
+       select KTIME_SCALAR
+       select GENERIC_CLOCKEVENTS
+       select GENERIC_CLOCKEVENTS_BROADCAST
        ---help---
          Qualcomm Hexagon is a processor architecture designed for high
          performance and low power across a wide variety of applications.
@@@ -179,10 -183,10 +170,9 @@@ endchoic
  source "mm/Kconfig"
  
  source "kernel/Kconfig.hz"
- source "kernel/time/Kconfig"
  
  config GENERIC_GPIO
 -      bool "Generic GPIO support"
 -      default n
 +      def_bool n
  
  endmenu
  
index ba667b60f32d8bb4f99a78b0cd234c2720f35545,9f9d57bf8a2f2ce35cd130df069acfbf914d8145..8186ec5ea15168a31a1a876b8a7b52ec7c8f4616
@@@ -33,10 -33,8 +33,12 @@@ config IA6
        select ARCH_WANT_OPTIONAL_GPIOLIB
        select ARCH_HAVE_NMI_SAFE_CMPXCHG
        select GENERIC_IOMAP
 +      select GENERIC_SMP_IDLE_THREAD
 +      select ARCH_INIT_TASK
 +      select ARCH_TASK_STRUCT_ALLOCATOR
 +      select ARCH_THREAD_INFO_ALLOCATOR
+       select ARCH_CLOCKSOURCE_DATA
+       select GENERIC_TIME_VSYSCALL
        default y
        help
          The Itanium Processor Family is Intel's 64-bit successor to
index 85aad0321397fa420529d50bde88501f8f3e664a,b65a730cba75a35a8526fcca44282fd133507155..3aa826bcbf96afe5b2cef1ac8b87422e487f723c
@@@ -29,8 -29,8 +29,10 @@@ config MIP
        select HAVE_MEMBLOCK
        select HAVE_MEMBLOCK_NODE_MAP
        select ARCH_DISCARD_MEMBLOCK
 +      select GENERIC_SMP_IDLE_THREAD
 +      select BUILDTIME_EXTABLE_SORT
+       select GENERIC_CLOCKEVENTS
+       select GENERIC_CMOS_UPDATE
  
  menu "Machine selection"
  
Simple merge
index 0a947bd9c0760a8eff4aa79b1a08066af8e75fc4,d47cf7ffa792af80be09d1c35b1ffb4f4b5ba503..00b9874e2240d79a669ab40af6602fb403d7104d
@@@ -137,10 -132,12 +128,13 @@@ config PP
        select IRQ_FORCED_THREADING
        select HAVE_RCU_TABLE_FREE if SMP
        select HAVE_SYSCALL_TRACEPOINTS
 -      select HAVE_BPF_JIT if (PPC64 && NET)
 +      select HAVE_BPF_JIT if PPC64
        select HAVE_ARCH_JUMP_LABEL
        select ARCH_HAVE_NMI_SAFE_CMPXCHG
 +      select GENERIC_SMP_IDLE_THREAD
+       select GENERIC_CMOS_UPDATE
+       select GENERIC_TIME_VSYSCALL
+       select GENERIC_CLOCKEVENTS
  
  config EARLY_PRINTK
        bool
index e16390c0bca80d356a6fdfb7b5aac57a10fc664e,d0325d9ae21f1b8a03d6815bca603954f5d01c50..b403c533432c94438260df3b524434efdb6db4ce
@@@ -122,7 -116,9 +116,10 @@@ config S39
        select ARCH_INLINE_WRITE_UNLOCK_BH
        select ARCH_INLINE_WRITE_UNLOCK_IRQ
        select ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE
 +      select GENERIC_SMP_IDLE_THREAD
+       select GENERIC_TIME_VSYSCALL
+       select GENERIC_CLOCKEVENTS
+       select KTIME_SCALAR if 32BIT
  
  config SCHED_OMIT_FRAME_POINTER
        def_bool y
diff --cc arch/sh/Kconfig
index 3e723aaa5e18adfa9588f5b7f642ff973f10dc69,820dfe3c7b69190e08a99399a18b2cfd2ef1ec45..5e05c0b445bb1f89978f866d5c15e20dc9745a83
@@@ -28,7 -28,8 +28,9 @@@ config SUPER
        select RTC_LIB
        select GENERIC_ATOMIC64
        select GENERIC_IRQ_SHOW
 +      select GENERIC_SMP_IDLE_THREAD
+       select GENERIC_CLOCKEVENTS
+       select GENERIC_CMOS_UPDATE if SH_SH03 || SH_DREAMCAST
        help
          The SuperH is a RISC processor targeted for use in embedded systems
          and consumer electronics; it was also used in the Sega Dreamcast
@@@ -607,12 -576,7 +599,10 @@@ config SH_CLK_CP
  config SH_CLK_CPG_LEGACY
        depends on SH_CLK_CPG
        def_bool y if !CPU_SUBTYPE_SH7785 && !ARCH_SHMOBILE && \
 -                    !CPU_SHX3 && !CPU_SUBTYPE_SH7757
 +                    !CPU_SHX3 && !CPU_SUBTYPE_SH7757 && \
 +                    !CPU_SUBTYPE_SH7734 && !CPU_SUBTYPE_SH7264 && \
 +                    !CPU_SUBTYPE_SH7269
 +
- source "kernel/time/Kconfig"
  endmenu
  
  menu "CPU Frequency scaling"
index 1ea3fd954756587358b3f16d99f3a2a32aceee65,b5a035a5c53ab33c6b794ed95257c8746a373459..2d493a3bdfe119f355b75733297d39c2a8c08f8f
@@@ -30,14 -30,13 +30,17 @@@ config SPAR
        select USE_GENERIC_SMP_HELPERS if SMP
        select GENERIC_PCI_IOMAP
        select HAVE_NMI_WATCHDOG if SPARC64
 +      select HAVE_BPF_JIT
 +      select GENERIC_SMP_IDLE_THREAD
+       select GENERIC_CMOS_UPDATE
++      select GENERIC_CLOCKEVENTS
  
  config SPARC32
        def_bool !64BIT
        select GENERIC_ATOMIC64
        select CLZ_TAB
 +      select ARCH_THREAD_INFO_ALLOCATOR
+       select ARCH_USES_GETTIMEOFFSET
  
  config SPARC64
        def_bool 64BIT
index 74239dd77e066e6c873ee5781f53304ab5c8b4b7,4eec3a1a72c05bd41784825e7888acde0b2da024..6ad6219fc47e0bf4a0751ec862dffa2a6a115fd3
@@@ -11,9 -11,9 +11,10 @@@ config TIL
        select GENERIC_IRQ_PROBE
        select GENERIC_PENDING_IRQ if SMP
        select GENERIC_IRQ_SHOW
 +      select HAVE_SYSCALL_WRAPPERS if TILEGX
        select SYS_HYPERVISOR
        select ARCH_HAVE_NMI_SAFE_CMPXCHG
+       select GENERIC_CLOCKEVENTS
  
  # FIXME: investigate whether we need/want these options.
  #     select HAVE_IOREMAP_PROT
index 43ef890d292c22081907f7983639f620d49c8483,806185de0ba20443c9567c81c12d90e6e3614f77..cb837c22392203d0ef258dd9aa614f6b52f42a79
@@@ -52,10 -53,11 +53,6 @@@ config GENERIC_BU
        default y
        depends on BUG
  
- config GENERIC_CLOCKEVENTS
 -# Used in kernel/irq/manage.c and include/linux/irq.h
 -config IRQ_RELEASE_METHOD
--      bool
--      default y
--
  config HZ
        int
        default 100
index 0b2d5f24c946e7a0ef96571db2e48c9c666136ac,1b1e0493ef7f097b89dc3c76aea956f7a00e2c02..66cc380bebf007403ccdc72afdab31b2c98f746e
@@@ -82,12 -82,16 +82,19 @@@ config X8
        select ARCH_HAVE_NMI_SAFE_CMPXCHG
        select GENERIC_IOMAP
        select DCACHE_WORD_ACCESS
 +      select GENERIC_SMP_IDLE_THREAD
 +      select HAVE_ARCH_SECCOMP_FILTER
 +      select BUILDTIME_EXTABLE_SORT
+       select GENERIC_CMOS_UPDATE
+       select CLOCKSOURCE_WATCHDOG
+       select GENERIC_CLOCKEVENTS
+       select ARCH_CLOCKSOURCE_DATA if X86_64
+       select GENERIC_CLOCKEVENTS_BROADCAST if X86_64 || (X86_32 && X86_LOCAL_APIC)
+       select GENERIC_TIME_VSYSCALL if X86_64
+       select KTIME_SCALAR if X86_32
  
  config INSTRUCTION_DECODER
 -      def_bool (KPROBES || PERF_EVENTS)
 +      def_bool (KPROBES || PERF_EVENTS || UPROBES)
  
  config OUTPUT_FORMAT
        string
diff --cc init/Kconfig
Simple merge