Skip to content

Commit 7063942

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: John Stultz <john.stultz@linaro.org>
1 parent 189374a commit 7063942

File tree

11 files changed

+14
-13
lines changed

11 files changed

+14
-13
lines changed

arch/ia64/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ config IA64
3838
select ARCH_TASK_STRUCT_ALLOCATOR
3939
select ARCH_THREAD_INFO_ALLOCATOR
4040
select ARCH_CLOCKSOURCE_DATA
41-
select GENERIC_TIME_VSYSCALL
41+
select GENERIC_TIME_VSYSCALL_OLD
4242
default y
4343
help
4444
The Itanium Processor Family is Intel's 64-bit successor to

arch/ia64/kernel/time.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ void update_vsyscall_tz(void)
454454
{
455455
}
456456

457-
void update_vsyscall(struct timespec *wall, struct timespec *wtm,
457+
void update_vsyscall_old(struct timespec *wall, struct timespec *wtm,
458458
struct clocksource *c, u32 mult)
459459
{
460460
write_seqcount_begin(&fsyscall_gtod_data.seq);

arch/powerpc/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ config PPC
135135
select ARCH_HAVE_NMI_SAFE_CMPXCHG
136136
select GENERIC_SMP_IDLE_THREAD
137137
select GENERIC_CMOS_UPDATE
138-
select GENERIC_TIME_VSYSCALL
138+
select GENERIC_TIME_VSYSCALL_OLD
139139
select GENERIC_CLOCKEVENTS
140140
select GENERIC_STRNCPY_FROM_USER
141141
select GENERIC_STRNLEN_USER

arch/powerpc/kernel/time.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -712,7 +712,7 @@ static cycle_t timebase_read(struct clocksource *cs)
712712
return (cycle_t)get_tb();
713713
}
714714

715-
void update_vsyscall(struct timespec *wall_time, struct timespec *wtm,
715+
void update_vsyscall_old(struct timespec *wall_time, struct timespec *wtm,
716716
struct clocksource *clock, u32 mult)
717717
{
718718
u64 new_tb_to_xs, new_stamp_xsec;

arch/s390/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ config S390
121121
select ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE
122122
select ARCH_WANT_IPC_PARSE_VERSION
123123
select GENERIC_SMP_IDLE_THREAD
124-
select GENERIC_TIME_VSYSCALL
124+
select GENERIC_TIME_VSYSCALL_OLD
125125
select GENERIC_CLOCKEVENTS
126126
select KTIME_SCALAR if 32BIT
127127
select HAVE_ARCH_SECCOMP_FILTER

arch/s390/kernel/time.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ struct clocksource * __init clocksource_default_clock(void)
219219
return &clocksource_tod;
220220
}
221221

222-
void update_vsyscall(struct timespec *wall_time, struct timespec *wtm,
222+
void update_vsyscall_old(struct timespec *wall_time, struct timespec *wtm,
223223
struct clocksource *clock, u32 mult)
224224
{
225225
if (clock != &clocksource_tod)

arch/x86/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ config X86
9393
select GENERIC_CLOCKEVENTS
9494
select ARCH_CLOCKSOURCE_DATA if X86_64
9595
select GENERIC_CLOCKEVENTS_BROADCAST if X86_64 || (X86_32 && X86_LOCAL_APIC)
96-
select GENERIC_TIME_VSYSCALL if X86_64
96+
select GENERIC_TIME_VSYSCALL_OLD if X86_64
9797
select KTIME_SCALAR if X86_32
9898
select GENERIC_STRNCPY_FROM_USER
9999
select GENERIC_STRNLEN_USER

arch/x86/kernel/vsyscall_64.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ void update_vsyscall_tz(void)
8282
vsyscall_gtod_data.sys_tz = sys_tz;
8383
}
8484

85-
void update_vsyscall(struct timespec *wall_time, struct timespec *wtm,
85+
void update_vsyscall_old(struct timespec *wall_time, struct timespec *wtm,
8686
struct clocksource *clock, u32 mult)
8787
{
8888
struct timespec monotonic;

include/linux/timekeeper_internal.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,14 @@ struct timekeeper {
6767
};
6868

6969

70-
#ifdef CONFIG_GENERIC_TIME_VSYSCALL
70+
#ifdef CONFIG_GENERIC_TIME_VSYSCALL_OLD
7171
extern void
72-
update_vsyscall(struct timespec *ts, struct timespec *wtm,
72+
update_vsyscall_old(struct timespec *ts, struct timespec *wtm,
7373
struct clocksource *c, u32 mult);
7474
extern void update_vsyscall_tz(void);
7575
#else
76-
static inline void update_vsyscall(struct timespec *ts, struct timespec *wtm,
76+
static inline void
77+
update_vsyscall_old(struct timespec *ts, struct timespec *wtm,
7778
struct clocksource *c, u32 mult)
7879
{
7980
}

kernel/time/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ config ARCH_CLOCKSOURCE_DATA
1313
bool
1414

1515
# Timekeeping vsyscall support
16-
config GENERIC_TIME_VSYSCALL
16+
config GENERIC_TIME_VSYSCALL_OLD
1717
bool
1818

1919
# ktime_t scalar 64bit nsec representation

kernel/time/timekeeping.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ static void timekeeping_update(struct timekeeper *tk, bool clearntp)
199199
ntp_clear();
200200
}
201201
xt = tk_xtime(tk);
202-
update_vsyscall(&xt, &tk->wall_to_monotonic, tk->clock, tk->mult);
202+
update_vsyscall_old(&xt, &tk->wall_to_monotonic, tk->clock, tk->mult);
203203
}
204204

205205
/**

0 commit comments

Comments
 (0)