summaryrefslogtreecommitdiffstats
path: root/arch/ia64/include/asm/hw_irq.h
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2014-10-24 13:26:37 -0700
committerH. Peter Anvin <hpa@linux.intel.com>2014-10-24 13:26:37 -0700
commitdb65bcfd9563a7531c3dd46c350565705be1fd84 (patch)
treeff7b068472764e36ab02a739917e206dd11d6b46 /arch/ia64/include/asm/hw_irq.h
parentb47dcbdc5161d3d5756f430191e2840d9b855492 (diff)
parentf114040e3ea6e07372334ade75d1ee0775c355e1 (diff)
downloadlinux-db65bcfd9563a7531c3dd46c350565705be1fd84.tar.gz
linux-db65bcfd9563a7531c3dd46c350565705be1fd84.tar.bz2
linux-db65bcfd9563a7531c3dd46c350565705be1fd84.zip
Merge tag 'v3.18-rc1' into x86/urgent
Reason: Need to apply audit patch on top of v3.18-rc1. Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/ia64/include/asm/hw_irq.h')
-rw-r--r--arch/ia64/include/asm/hw_irq.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/hw_irq.h b/arch/ia64/include/asm/hw_irq.h
index 029bab36cd91..668786e84af8 100644
--- 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