projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'core-fixes-for-linus', 'x86-fixes-for-linus', 'timers-fixes-for-linus...
[linux-2.6-microblaze.git]
/
arch
/
x86
/
kernel
/
tsc.c
diff --git
a/arch/x86/kernel/tsc.c
b/arch/x86/kernel/tsc.c
index
ae09f97
..
ffe5755
100644
(file)
--- a/
arch/x86/kernel/tsc.c
+++ b/
arch/x86/kernel/tsc.c
@@
-659,7
+659,7
@@
void restore_sched_clock_state(void)
local_irq_save(flags);
- __
get_cpu_var(cyc2ns_offset) = 0
;
+ __
this_cpu_write(cyc2ns_offset, 0)
;
offset = cyc2ns_suspend - sched_clock();
for_each_possible_cpu(cpu)