Commit 03d3602a 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 core update from Thomas Gleixner:
 - Bug fixes (one for a longstanding dead loop issue)
 - Rework of time related vsyscalls
 - Alarm timer updates
 - Jiffies updates to remove compile time dependencies

* 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  timekeeping: Cast raw_interval to u64 to avoid shift overflow
  timers: Fix endless looping between cascade() and internal_add_timer()
  time/jiffies: bring back unconditional LATCH definition
  time: Convert x86_64 to using new update_vsyscall
  time: Only do nanosecond rounding on GENERIC_TIME_VSYSCALL_OLD systems
  time: Introduce new GENERIC_TIME_VSYSCALL
  time: Convert CONFIG_GENERIC_TIME_VSYSCALL to CONFIG_GENERIC_TIME_VSYSCALL_OLD
  time: Move update_vsyscall definitions to timekeeper_internal.h
  time: Move timekeeper structure to timekeeper_internal.h for vsyscall changes
  jiffies: Remove compile time assumptions about CLOCK_TICK_RATE
  jiffies: Kill unused TICK_USEC_TO_NSEC
  alarmtimer: Rename alarmtimer_remove to alarmtimer_dequeue
  alarmtimer: Remove unused helpers & defines
  alarmtimer: Use hrtimer per-alarm instead of per-base
  alarmtimer: Implement minimum alarm interval for allowing suspend
parents 0588f1f9 5b3900cd

arch/ia64/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ config IA64 
	select ARCH_TASK_STRUCT_ALLOCATOR

	select ARCH_THREAD_INFO_ALLOCATOR

	select ARCH_CLOCKSOURCE_DATA

	select GENERIC_TIME_VSYSCALL

	select GENERIC_TIME_VSYSCALL_OLD

	default y

	help

	  The Itanium Processor Family is Intel's 64-bit successor to

arch/ia64/kernel/time.c

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include <linux/interrupt.h>

#include <linux/efi.h>

#include <linux/timex.h>

#include <linux/clocksource.h>

#include <linux/timekeeper_internal.h>

#include <linux/platform_device.h>



#include <asm/machvec.h>
@@ -454,7 +454,7 @@ void update_vsyscall_tz(void) 
{

}



void update_vsyscall(struct timespec *wall, struct timespec *wtm,

void update_vsyscall_old(struct timespec *wall, struct timespec *wtm,

			struct clocksource *c, u32 mult)

{

	write_seqcount_begin(&fsyscall_gtod_data.seq);

arch/powerpc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ config PPC 
	select ARCH_HAVE_NMI_SAFE_CMPXCHG

	select GENERIC_SMP_IDLE_THREAD

	select GENERIC_CMOS_UPDATE

	select GENERIC_TIME_VSYSCALL

	select GENERIC_TIME_VSYSCALL_OLD

	select GENERIC_CLOCKEVENTS

	select GENERIC_STRNCPY_FROM_USER

	select GENERIC_STRNLEN_USER

arch/powerpc/kernel/time.c

+2 −2
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ 
/* powerpc clocksource/clockevent code */



#include <linux/clockchips.h>

#include <linux/clocksource.h>

#include <linux/timekeeper_internal.h>



static cycle_t rtc_read(struct clocksource *);

static struct clocksource clocksource_rtc = {
@@ -727,7 +727,7 @@ static cycle_t timebase_read(struct clocksource *cs) 
	return (cycle_t)get_tb();

}



void update_vsyscall(struct timespec *wall_time, struct timespec *wtm,

void update_vsyscall_old(struct timespec *wall_time, struct timespec *wtm,

			struct clocksource *clock, u32 mult)

{

	u64 new_tb_to_xs, new_stamp_xsec;

arch/s390/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ config S390 
	select HAVE_UID16 if 32BIT

	select ARCH_WANT_IPC_PARSE_VERSION

	select GENERIC_SMP_IDLE_THREAD

	select GENERIC_TIME_VSYSCALL

	select GENERIC_TIME_VSYSCALL_OLD

	select GENERIC_CLOCKEVENTS

	select KTIME_SCALAR if 32BIT

	select HAVE_ARCH_SECCOMP_FILTER

CRA Git | Maintained and supported by SUSTech CRA and CCSE