aboutsummaryrefslogtreecommitdiff
path: root/arch/parisc/mm/fault.c
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2016-05-05 13:36:03 +0800
committerAlex Shi <alex.shi@linaro.org>2016-05-05 13:36:03 +0800
commite91b1cc90283c1b9b75670b027a18afbd20fe070 (patch)
tree81c395406a3774775a183d544aee9c5ced1c31d6 /arch/parisc/mm/fault.c
parentd83731cf53fd3af7173cab5e3f573d06ebc852be (diff)
parent0b3df30dcadcddc56aed56c3c2d2de2ca963e81d (diff)
Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-rtlsk-v4.1-16.06-rtlsk-v4.1-16.05-rt
Diffstat (limited to 'arch/parisc/mm/fault.c')
-rw-r--r--arch/parisc/mm/fault.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c
index 15503adddf4f..3bc9db1ad19a 100644
--- a/arch/parisc/mm/fault.c
+++ b/arch/parisc/mm/fault.c
@@ -151,6 +151,7 @@ int fixup_exception(struct pt_regs *regs)
struct exception_data *d;
d = this_cpu_ptr(&exception_data);
d->fault_ip = regs->iaoq[0];
+ d->fault_gp = regs->gr[27];
d->fault_space = regs->isr;
d->fault_addr = regs->ior;