From: Linus Torvalds Date: Thu, 24 May 2012 20:29:46 +0000 (-0700) Subject: Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: v5.15~22394 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c7523a7c88db637d66841018532cb4b3ab6ab0a8;p=platform%2Fkernel%2Flinux-starfive.git Merge branch 'timers-core-for-linus' of git://git./linux/kernel/git/tip/tip 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 ... --- c7523a7c88db637d66841018532cb4b3ab6ab0a8 diff --cc arch/alpha/Kconfig index 0893f02,77ba268..3de74c9 --- a/arch/alpha/Kconfig +++ b/arch/alpha/Kconfig @@@ -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, diff --cc arch/arm/Kconfig index 4f4c811,c1e5f07..312450941 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@@ -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 diff --cc arch/blackfin/Kconfig index 79cfe26,f7897ee..04ec0d8 --- a/arch/blackfin/Kconfig +++ b/arch/blackfin/Kconfig @@@ -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 diff --cc arch/cris/Kconfig index 2995035,4a63e7e..22d34d6 --- a/arch/cris/Kconfig +++ b/arch/cris/Kconfig @@@ -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 diff --cc arch/hexagon/Kconfig index bc979f7,35f6c32..b2fdfb70 --- a/arch/hexagon/Kconfig +++ b/arch/hexagon/Kconfig @@@ -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 diff --cc arch/ia64/Kconfig index ba667b6,9f9d57b..8186ec5 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@@ -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 diff --cc arch/mips/Kconfig index 85aad03,b65a730..3aa826b --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@@ -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" diff --cc arch/powerpc/Kconfig index 0a947bd,d47cf7f..00b9874 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@@ -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 diff --cc arch/s390/Kconfig index e16390c,d0325d9..b403c53 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig @@@ -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 3e723aa,820dfe3..5e05c0b --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig @@@ -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" diff --cc arch/sparc/Kconfig index 1ea3fd9,b5a035a..2d493a3 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig @@@ -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 diff --cc arch/tile/Kconfig index 74239dd,4eec3a1..6ad6219 --- a/arch/tile/Kconfig +++ b/arch/tile/Kconfig @@@ -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 diff --cc arch/um/Kconfig.common index 43ef890,806185d..cb837c2 --- a/arch/um/Kconfig.common +++ b/arch/um/Kconfig.common @@@ -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 diff --cc arch/x86/Kconfig index 0b2d5f2,1b1e049..66cc380 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@@ -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