Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7523a7c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/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
  ...
parents 2f78d8e2 b80fe101

arch/alpha/Kconfig

+1 −3
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ config ALPHA 
	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,
@@ -48,9 +49,6 @@ config GENERIC_CALIBRATE_DELAY 
	bool

	default y



config GENERIC_CMOS_UPDATE

        def_bool y



config GENERIC_GPIO

	bool

arch/arm/Kconfig

+2 −18
Original line number Diff line number Diff line
@@ -40,6 +40,8 @@ config ARM 
	select GENERIC_PCI_IOMAP

	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
@@ -63,22 +65,6 @@ config SYS_SUPPORTS_APM_EMULATION 
config GENERIC_GPIO

	bool



config ARCH_USES_GETTIMEOFFSET

	bool

	default n



config GENERIC_CLOCKEVENTS

	bool



config GENERIC_CLOCKEVENTS_BROADCAST

	bool

	depends on GENERIC_CLOCKEVENTS

	default y if SMP



config KTIME_SCALAR

	bool

	default y



config HAVE_TCM

	bool

	select GENERIC_ALLOCATOR
@@ -1438,8 +1424,6 @@ endmenu 


menu "Kernel Features"



source "kernel/time/Kconfig"



config HAVE_SMP

	bool

	help

arch/avr32/Kconfig

+1 −5
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ config AVR32 
	select HARDIRQS_SW_RESEND

	select GENERIC_IRQ_SHOW

	select ARCH_HAVE_NMI_SAFE_CMPXCHG

	select GENERIC_CLOCKEVENTS

	help

	  AVR32 is a high-performance 32-bit RISC microprocessor core,

	  designed for cost-sensitive embedded applications, with particular
@@ -35,9 +36,6 @@ config TRACE_IRQFLAGS_SUPPORT 
config RWSEM_GENERIC_SPINLOCK

	def_bool y



config GENERIC_CLOCKEVENTS

	def_bool y



config RWSEM_XCHGADD_ALGORITHM

	def_bool n
@@ -63,8 +61,6 @@ source "kernel/Kconfig.freezer" 


menu "System Type and features"



source "kernel/time/Kconfig"



config SUBARCH_AVR32B

	bool

config MMU

arch/blackfin/Kconfig

+3 −7
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ config BLACKFIN 
	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
@@ -642,9 +643,10 @@ comment "Kernel Timer/Scheduler" 


source kernel/Kconfig.hz



config GENERIC_CLOCKEVENTS

config SET_GENERIC_CLOCKEVENTS

	bool "Generic clock events"

	default y

	select GENERIC_CLOCKEVENTS



menu "Clock event device"

	depends on GENERIC_CLOCKEVENTS
@@ -678,12 +680,6 @@ config GPTMR0_CLOCKSOURCE 
	depends on !TICKSOURCE_GPTMR0

endmenu



config ARCH_USES_GETTIMEOFFSET

	depends on !GENERIC_CLOCKEVENTS

	def_bool y



source kernel/time/Kconfig



comment "Misc"



choice

arch/c6x/Kconfig

+1 −7
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ config C6X 
	select IRQ_DOMAIN

	select OF

	select OF_EARLY_FLATTREE

	select GENERIC_CLOCKEVENTS



config MMU

	def_bool n
@@ -31,12 +32,6 @@ config GENERIC_CALIBRATE_DELAY 
config GENERIC_HWEIGHT

	def_bool y



config GENERIC_CLOCKEVENTS

	def_bool y



config GENERIC_CLOCKEVENTS_BROADCAST

	bool



config GENERIC_BUG

	def_bool y
@@ -125,7 +120,6 @@ source "mm/Kconfig" 
source "kernel/Kconfig.preempt"



source "kernel/Kconfig.hz"

source "kernel/time/Kconfig"



endmenu