diff options
| author | Joakim Tjernlund <joakim.tjernlund@infinera.com> | 2017-09-05 13:59:43 +0200 |
|---|---|---|
| committer | Scott Wood <oss@buserror.net> | 2018-01-20 23:08:43 -0600 |
| commit | bb8651e5ce2c23c36998b263272ab2f9203f5a2e (patch) | |
| tree | ca5f924d3f79e6be3e982e00ebd20f75356adeec /arch/powerpc/sysdev | |
| parent | f2ac428e0edabbca41b9dfe9473a90147962e4e9 (diff) | |
| download | linux-stable-bb8651e5ce2c23c36998b263272ab2f9203f5a2e.tar.gz linux-stable-bb8651e5ce2c23c36998b263272ab2f9203f5a2e.tar.bz2 linux-stable-bb8651e5ce2c23c36998b263272ab2f9203f5a2e.zip | |
powerpc/fsl_pci: Correct fsl_pci_mcheck_exception
get_user() had it args reversed causing NIP to be NULL:ed instead
of fixing up the PCI access.
Note: This still hangs my P1020 Freescale CPU hard, but at least
I get a NIP now.
Signed-off-by: Joakim Tjernlund <joakim.tjernlund@infinera.com>
Acked-by: Li Yang <leoyang.li@nxp.com>
Signed-off-by: Scott Wood <oss@buserror.net>
Diffstat (limited to 'arch/powerpc/sysdev')
| -rw-r--r-- | arch/powerpc/sysdev/fsl_pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c index 1e57edd4947a..0c524c20c462 100644 --- a/arch/powerpc/sysdev/fsl_pci.c +++ b/arch/powerpc/sysdev/fsl_pci.c @@ -1070,7 +1070,7 @@ int fsl_pci_mcheck_exception(struct pt_regs *regs) if (is_in_pci_mem_space(addr)) { if (user_mode(regs)) { pagefault_disable(); - ret = get_user(regs->nip, &inst); + ret = get_user(inst, (__u32 __user *)regs->nip); pagefault_enable(); } else { ret = probe_kernel_address((void *)regs->nip, inst); |