Merge tag 'kvm-arm-for-3.18-take-2' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / kernel / irq / chip.c

diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index 8fb52e9bddc1deb1334eab08d1b2cf75233c299e..e5202f00cabcdb892b3f4ad39c53f7fe943a0751 100644 (file)
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -699,7 +699,7 @@ void handle_percpu_devid_irq(unsigned int irq, struct irq_desc *desc)
 {
        struct irq_chip *chip = irq_desc_get_chip(desc);
        struct irqaction *action = desc->action;
-       void *dev_id = __this_cpu_ptr(action->percpu_dev_id);
+       void *dev_id = raw_cpu_ptr(action->percpu_dev_id);
        irqreturn_t res;
 
        kstat_incr_irqs_this_cpu(irq, desc);