Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
y2038: vdso: nds32: open-code timespec_add_ns()
The nds32 vdso is now the last user of the deprecated timespec_add_ns().
Change it to an open-coded version like the one it already uses in
do_realtime(). What we should really do though is to use the
generic vdso implementation that is now used in x86. arm and mips.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+15
-18
+15
-18
arch/nds32/kernel/vdso/gettimeofday.c
+15
-18
arch/nds32/kernel/vdso/gettimeofday.c
···
81
81
static notrace int do_monotonic_coarse(struct __kernel_old_timespec *ts,
82
82
struct vdso_data *vdata)
83
83
{
84
-
struct timespec tomono;
85
84
u32 seq;
85
+
u64 ns;
86
86
87
87
do {
88
88
seq = vdso_read_begin(vdata);
89
89
90
-
ts->tv_sec = vdata->xtime_coarse_sec;
91
-
ts->tv_nsec = vdata->xtime_coarse_nsec;
92
-
93
-
tomono.tv_sec = vdata->wtm_clock_sec;
94
-
tomono.tv_nsec = vdata->wtm_clock_nsec;
90
+
ts->tv_sec = vdata->xtime_coarse_sec + vdata->wtm_clock_sec;
91
+
ns = vdata->xtime_coarse_nsec + vdata->wtm_clock_nsec;
95
92
96
93
} while (vdso_read_retry(vdata, seq));
97
94
98
-
ts->tv_sec += tomono.tv_sec;
99
-
timespec_add_ns(ts, tomono.tv_nsec);
95
+
ts->tv_sec += __iter_div_u64_rem(ns, NSEC_PER_SEC, &ns);
96
+
ts->tv_nsec = ns;
97
+
100
98
return 0;
101
99
}
102
100
···
133
135
134
136
static notrace int do_monotonic(struct __kernel_old_timespec *ts, struct vdso_data *vdata)
135
137
{
136
-
struct timespec tomono;
137
-
u64 nsecs;
138
+
u64 ns;
138
139
u32 seq;
139
140
140
141
do {
141
142
seq = vdso_read_begin(vdata);
142
143
143
144
ts->tv_sec = vdata->xtime_clock_sec;
144
-
nsecs = vdata->xtime_clock_nsec;
145
-
nsecs += vgetsns(vdata);
146
-
nsecs >>= vdata->cs_shift;
145
+
ns = vdata->xtime_clock_nsec;
146
+
ns += vgetsns(vdata);
147
+
ns >>= vdata->cs_shift;
147
148
148
-
tomono.tv_sec = vdata->wtm_clock_sec;
149
-
tomono.tv_nsec = vdata->wtm_clock_nsec;
149
+
ts->tv_sec += vdata->wtm_clock_sec;
150
+
ns += vdata->wtm_clock_nsec;
150
151
151
152
} while (vdso_read_retry(vdata, seq));
152
153
153
-
ts->tv_sec += tomono.tv_sec;
154
-
ts->tv_nsec = 0;
155
-
timespec_add_ns(ts, nsecs + tomono.tv_nsec);
154
+
ts->tv_sec += __iter_div_u64_rem(ns, NSEC_PER_SEC, &ns);
155
+
ts->tv_nsec = ns;
156
+
156
157
return 0;
157
158
}
158
159