projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux...
[cascardo/linux.git]
/
drivers
/
clocksource
/
metag_generic.c
diff --git
a/drivers/clocksource/metag_generic.c
b/drivers/clocksource/metag_generic.c
index
9e4db41
..
b7384b8
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);