Merge branch 'akpm-current/current'

[karo-tx-linux.git] / arch / powerpc / sysdev / fsl_pci.c

diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c
index 1c65ef92768dbb553563506373094338ad92e7f9..610f472f91d14c25cef49a118ecc7f1d9eaf73b1 100644 (file)
--- a/arch/powerpc/sysdev/fsl_pci.c
+++ b/arch/powerpc/sysdev/fsl_pci.c
@@ -1037,7 +1037,7 @@ int fsl_pci_mcheck_exception(struct pt_regs *regs)
                        ret = get_user(regs->nip, &inst);
                        pagefault_enable();
                } else {
-                       ret = probe_kernel_address(regs->nip, inst);
+                       ret = probe_kernel_address((void *)regs->nip, inst);
                }
 
                if (!ret && mcheck_handle_load(regs, inst)) {