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 tag 'v4.0-rc3' into HEAD
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
clocksource
/
metag_generic.c
diff --git
a/drivers/clocksource/metag_generic.c
b/drivers/clocksource/metag_generic.c
index 9e4db41abe3ccc0a84b350e159f7fa2ed6b001b2..b7384b853e5a8203534d398f3adb7ec20089f7cc 100644
(file)
--- a/
drivers/clocksource/metag_generic.c
+++ b/
drivers/clocksource/metag_generic.c
@@
-90,7
+90,7
@@
static struct clocksource clocksource_metag = {
static irqreturn_t metag_timer_interrupt(int irq, void *dummy)
{
- struct clock_event_device *evt =
&__get_cpu_var(
local_clockevent);
+ struct clock_event_device *evt =
this_cpu_ptr(&
local_clockevent);
evt->event_handler(evt);