Commit 39adff5f 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 

* '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
  ...
parents 8a4a8918 e35f95b3

arch/arm/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -346,7 +346,6 @@ config ARCH_GEMINI 
config ARCH_PRIMA2

	bool "CSR SiRFSoC PRIMA2 ARM Cortex A9 Platform"

	select CPU_V7

	select GENERIC_TIME

	select NO_IOPORT

	select GENERIC_CLOCKEVENTS

	select CLKDEV_LOOKUP
@@ -520,7 +519,6 @@ config ARCH_LPC32XX 
	select ARM_AMBA

	select USB_ARCH_HAS_OHCI

	select CLKDEV_LOOKUP

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	help

	  Support for the NXP LPC32XX family of processors
@@ -599,7 +597,6 @@ config ARCH_TEGRA 
	bool "NVIDIA Tegra"

	select CLKDEV_LOOKUP

	select CLKSRC_MMIO

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select GENERIC_GPIO

	select HAVE_CLK
@@ -914,7 +911,6 @@ config ARCH_VT8500 
config ARCH_ZYNQ

	bool "Xilinx Zynq ARM Cortex A9 Platform"

	select CPU_V7

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select CLKDEV_LOOKUP

	select ARM_GIC

arch/mn10300/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -47,9 +47,6 @@ config GENERIC_CMOS_UPDATE 
config GENERIC_HWEIGHT

	def_bool y



config GENERIC_TIME

	def_bool y



config GENERIC_CLOCKEVENTS

	def_bool y

arch/s390/kernel/time.c

+9 −4
Original line number Diff line number Diff line
@@ -109,10 +109,14 @@ static void fixup_clock_comparator(unsigned long long delta) 
	set_clock_comparator(S390_lowcore.clock_comparator);

}



static int s390_next_event(unsigned long delta,

static int s390_next_ktime(ktime_t expires,

			   struct clock_event_device *evt)

{

	S390_lowcore.clock_comparator = get_clock() + delta;

	u64 nsecs;



	nsecs = ktime_to_ns(ktime_sub(expires, ktime_get_monotonic_offset()));

	do_div(nsecs, 125);

	S390_lowcore.clock_comparator = TOD_UNIX_EPOCH + (nsecs << 9);

	set_clock_comparator(S390_lowcore.clock_comparator);

	return 0;

}
@@ -137,14 +141,15 @@ void init_cpu_timer(void) 
	cpu = smp_processor_id();

	cd = &per_cpu(comparators, cpu);

	cd->name		= "comparator";

	cd->features		= CLOCK_EVT_FEAT_ONESHOT;

	cd->features		= CLOCK_EVT_FEAT_ONESHOT |

				  CLOCK_EVT_FEAT_KTIME;

	cd->mult		= 16777;

	cd->shift		= 12;

	cd->min_delta_ns	= 1;

	cd->max_delta_ns	= LONG_MAX;

	cd->rating		= 400;

	cd->cpumask		= cpumask_of(cpu);

	cd->set_next_event	= s390_next_event;

	cd->set_next_ktime	= s390_next_ktime;

	cd->set_mode		= s390_set_mode;



	clockevents_register_device(cd);

arch/tile/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -46,9 +46,6 @@ config NEED_PER_CPU_PAGE_FIRST_CHUNK 
config SYS_SUPPORTS_HUGETLBFS

	def_bool y



config GENERIC_TIME

	def_bool y



config GENERIC_CLOCKEVENTS

	def_bool y

arch/tile/configs/tilegx_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ CONFIG_HAVE_ARCH_ALLOC_REMAP=y 
CONFIG_HAVE_SETUP_PER_CPU_AREA=y

CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y

CONFIG_SYS_SUPPORTS_HUGETLBFS=y

CONFIG_GENERIC_TIME=y

CONFIG_GENERIC_CLOCKEVENTS=y

CONFIG_RWSEM_GENERIC_SPINLOCK=y

CONFIG_DEFAULT_MIGRATION_COST=10000000

CRA Git | Maintained and supported by SUSTech CRA and CCSE