projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fix/rt5645' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
[deliverable/linux.git]
/
kernel
/
time
/
timer.c
diff --git
a/kernel/time/timer.c
b/kernel/time/timer.c
index 5e097fa9faf7016470b8283931023a15d20ed97d..84190f02b521c9fc77cee6e6a6722000939ee470 100644
(file)
--- a/
kernel/time/timer.c
+++ b/
kernel/time/timer.c
@@
-807,8
+807,8
@@
__mod_timer(struct timer_list *timer, unsigned long expires,
spin_unlock(&base->lock);
base = new_base;
spin_lock(&base->lock);
- timer->flags &= ~TIMER_BASEMASK;
-
timer->flags |= base->cpu
;
+ WRITE_ONCE(timer->flags,
+
(timer->flags & ~TIMER_BASEMASK) | base->cpu)
;
}
}
This page took
0.060189 seconds
and
5
git commands to generate.