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

Commit 70639421 authored by John Stultz's avatar John Stultz
Browse files

time: Convert CONFIG_GENERIC_TIME_VSYSCALL to CONFIG_GENERIC_TIME_VSYSCALL_OLD 



To help migrate archtectures over to the new update_vsyscall method,
redfine CONFIG_GENERIC_TIME_VSYSCALL as CONFIG_GENERIC_TIME_VSYSCALL_OLD

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 189374ae

arch/ia64/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,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

+1 −1
Original line number Diff line number Diff line
@@ -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
@@ -135,7 +135,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

+1 −1
Original line number Diff line number Diff line
@@ -712,7 +712,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
@@ -121,7 +121,7 @@ config S390 
	select ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE

	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