diff options
| author | John Stultz <john.stultz@linaro.org> | 2012-09-04 21:34:21 +0200 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2012-09-24 18:38:07 +0200 |
| commit | 706394211648117762edfaeffd6fc04bf3b1a75d (patch) | |
| tree | 9ce33be0d144430c4089656a9e20c74d829d4638 /arch/s390 | |
| parent | time: Move update_vsyscall definitions to timekeeper_internal.h (diff) | |
| download | linux-706394211648117762edfaeffd6fc04bf3b1a75d.tar.xz linux-706394211648117762edfaeffd6fc04bf3b1a75d.zip | |
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: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/Kconfig | 2 | ||||
| -rw-r--r-- | arch/s390/kernel/time.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index 107610e01a29..ba488aa500de 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig @@ -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 diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c index bfb62ad312a6..c5430bf5b5e6 100644 --- a/arch/s390/kernel/time.c +++ b/arch/s390/kernel/time.c @@ -219,7 +219,7 @@ struct clocksource * __init clocksource_default_clock(void) return &clocksource_tod; } -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) { if (clock != &clocksource_tod) |