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

Commit 189374ae authored by John Stultz's avatar John Stultz
Browse files

time: Move update_vsyscall definitions to timekeeper_internal.h 



Since users will need to include timekeeper_internal.h, move
update_vsyscall definitions to timekeeper_internal.h.

Cc: Tony Luck <tony.luck@intel.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Paul Turner <pjt@google.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Richard Cochran <richardcochran@gmail.com>
Cc: Prarit Bhargava <prarit@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
parent d7b4202e

arch/ia64/kernel/time.c

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

#include <linux/interrupt.h>

#include <linux/efi.h>

#include <linux/efi.h>

#include <linux/timex.h>

#include <linux/timex.h>

#include <linux/clocksource.h>

#include <linux/timekeeper_internal.h>

#include <linux/platform_device.h>

#include <linux/platform_device.h>





#include <asm/machvec.h>

#include <asm/machvec.h>

arch/powerpc/kernel/time.c

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

/* powerpc clocksource/clockevent code */





#include <linux/clockchips.h>

#include <linux/clockchips.h>

#include <linux/clocksource.h>

#include <linux/timekeeper_internal.h>





static cycle_t rtc_read(struct clocksource *);

static cycle_t rtc_read(struct clocksource *);

static struct clocksource clocksource_rtc = {

static struct clocksource clocksource_rtc = {

arch/s390/kernel/time.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -34,7 +34,7 @@ 
#include <linux/profile.h>

#include <linux/profile.h>

#include <linux/timex.h>

#include <linux/timex.h>

#include <linux/notifier.h>

#include <linux/notifier.h>

#include <linux/clocksource.h>

#include <linux/timekeeper_internal.h>

#include <linux/clockchips.h>

#include <linux/clockchips.h>

#include <linux/gfp.h>

#include <linux/gfp.h>

#include <linux/kprobes.h>

#include <linux/kprobes.h>

arch/x86/kernel/vsyscall_64.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -28,7 +28,7 @@ 
#include <linux/jiffies.h>

#include <linux/jiffies.h>

#include <linux/sysctl.h>

#include <linux/sysctl.h>

#include <linux/topology.h>

#include <linux/topology.h>

#include <linux/clocksource.h>

#include <linux/timekeeper_internal.h>

#include <linux/getcpu.h>

#include <linux/getcpu.h>

#include <linux/cpu.h>

#include <linux/cpu.h>

#include <linux/smp.h>

#include <linux/smp.h>

include/linux/clocksource.h

+0 −16
Original line number Original line Diff line number Diff line
@@ -319,22 +319,6 @@ static inline void __clocksource_updatefreq_khz(struct clocksource *cs, u32 khz) 
	__clocksource_updatefreq_scale(cs, 1000, khz);

	__clocksource_updatefreq_scale(cs, 1000, khz);

}

}





#ifdef CONFIG_GENERIC_TIME_VSYSCALL

extern void

update_vsyscall(struct timespec *ts, struct timespec *wtm,

			struct clocksource *c, u32 mult);

extern void update_vsyscall_tz(void);

#else

static inline void

update_vsyscall(struct timespec *ts, struct timespec *wtm,

			struct clocksource *c, u32 mult)

{

}



static inline void update_vsyscall_tz(void)

{

}

#endif





extern void timekeeping_notify(struct clocksource *clock);

extern void timekeeping_notify(struct clocksource *clock);