Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / arch / ia64 / include / asm / hw_irq.h

diff --git a/arch/ia64/include/asm/hw_irq.h b/arch/ia64/include/asm/hw_irq.h
index 029bab36cd91c0e5949a7ad04ad68264a4be81ad..668786e84af8ae1eee5f0ac97d8926889fc2cb29 100644 (file)
--- a/arch/ia64/include/asm/hw_irq.h
+++ b/arch/ia64/include/asm/hw_irq.h
@@ -159,7 +159,7 @@ static inline ia64_vector __ia64_irq_to_vector(int irq)
 static inline 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