Merge tag 'ib-mfd-regulator-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into regulator-tps65090

Immutable branch between MFD and Regulator due for v3.16 merge-window.

1 files changed, 1 insertions, 1 deletions

diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c
index 9d08c71a967e..747550762f3c 100644
--- a/arch/parisc/mm/fault.c
+++ b/arch/parisc/mm/fault.c
@@ -151,7 +151,7 @@ int fixup_exception(struct pt_regs *regs)
         fix = search_exception_tables(regs->iaoq[0]);
         if (fix) {
                 struct exception_data *d;
-                d = &__get_cpu_var(exception_data);
+                d = this_cpu_ptr(&exception_data);
                 d->fault_ip = regs->iaoq[0];
                 d->fault_space = regs->isr;
                 d->fault_addr = regs->ior;