git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
arch
/
ia64
/
kernel
/
irq.c
diff --git
a/arch/ia64/kernel/irq.c
b/arch/ia64/kernel/irq.c
index f2c41828113050c19f0f09ce6d97beb733ebcd3e..812a1e6b317966610811bb10d97e7c1cdab84a80 100644
(file)
--- a/
arch/ia64/kernel/irq.c
+++ b/
arch/ia64/kernel/irq.c
@@
-42,7
+42,7
@@
ia64_vector __ia64_irq_to_vector(int irq)
unsigned int __ia64_local_vector_to_irq (ia64_vector vec)
{
- return __
get_cpu_var(vector_irq)[vec]
;
+ return __
this_cpu_read(vector_irq[vec])
;
}
#endif