diff options
Diffstat (limited to 'kernel/time/sched_clock.c')
-rw-r--r-- | kernel/time/sched_clock.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel/time/sched_clock.c b/kernel/time/sched_clock.c index 094b82ca95e5..142b07619918 100644 --- a/kernel/time/sched_clock.c +++ b/kernel/time/sched_clock.c | |||
@@ -94,7 +94,7 @@ static inline u64 notrace cyc_to_ns(u64 cyc, u32 mult, u32 shift) | |||
94 | unsigned long long notrace sched_clock(void) | 94 | unsigned long long notrace sched_clock(void) |
95 | { | 95 | { |
96 | u64 cyc, res; | 96 | u64 cyc, res; |
97 | unsigned long seq; | 97 | unsigned int seq; |
98 | struct clock_read_data *rd; | 98 | struct clock_read_data *rd; |
99 | 99 | ||
100 | do { | 100 | do { |
@@ -231,7 +231,7 @@ sched_clock_register(u64 (*read)(void), int bits, unsigned long rate) | |||
231 | if (irqtime > 0 || (irqtime == -1 && rate >= 1000000)) | 231 | if (irqtime > 0 || (irqtime == -1 && rate >= 1000000)) |
232 | enable_sched_clock_irqtime(); | 232 | enable_sched_clock_irqtime(); |
233 | 233 | ||
234 | pr_debug("Registered %pF as sched_clock source\n", read); | 234 | pr_debug("Registered %pS as sched_clock source\n", read); |
235 | } | 235 | } |
236 | 236 | ||
237 | void __init generic_sched_clock_init(void) | 237 | void __init generic_sched_clock_init(void) |
@@ -267,12 +267,12 @@ void __init generic_sched_clock_init(void) | |||
267 | */ | 267 | */ |
268 | static u64 notrace suspended_sched_clock_read(void) | 268 | static u64 notrace suspended_sched_clock_read(void) |
269 | { | 269 | { |
270 | unsigned long seq = raw_read_seqcount(&cd.seq); | 270 | unsigned int seq = raw_read_seqcount(&cd.seq); |
271 | 271 | ||
272 | return cd.read_data[seq & 1].epoch_cyc; | 272 | return cd.read_data[seq & 1].epoch_cyc; |
273 | } | 273 | } |
274 | 274 | ||
275 | static int sched_clock_suspend(void) | 275 | int sched_clock_suspend(void) |
276 | { | 276 | { |
277 | struct clock_read_data *rd = &cd.read_data[0]; | 277 | struct clock_read_data *rd = &cd.read_data[0]; |
278 | 278 | ||
@@ -283,7 +283,7 @@ static int sched_clock_suspend(void) | |||
283 | return 0; | 283 | return 0; |
284 | } | 284 | } |
285 | 285 | ||
286 | static void sched_clock_resume(void) | 286 | void sched_clock_resume(void) |
287 | { | 287 | { |
288 | struct clock_read_data *rd = &cd.read_data[0]; | 288 | struct clock_read_data *rd = &cd.read_data[0]; |
289 | 289 | ||