projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-3.9' of git://linux-nfs.org/~bfields/linux
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
kernel
/
sched_clock.c
diff --git
a/arch/arm/kernel/sched_clock.c
b/arch/arm/kernel/sched_clock.c
index fc6692e2b603b747553835f04a85bf3b1f9c5f3b..bd6f56b9ec2101534b7477c11c9f6ef0a3a6e68b 100644
(file)
--- a/
arch/arm/kernel/sched_clock.c
+++ b/
arch/arm/kernel/sched_clock.c
@@
-93,11
+93,11
@@
static void notrace update_sched_clock(void)
* detectable in cyc_to_fixed_sched_clock().
*/
raw_local_irq_save(flags);
- cd.epoch_cyc = cyc;
+ cd.epoch_cyc
_copy
= cyc;
smp_wmb();
cd.epoch_ns = ns;
smp_wmb();
- cd.epoch_cyc
_copy
= cyc;
+ cd.epoch_cyc = cyc;
raw_local_irq_restore(flags);
}