projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'powerpc-4.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mm
/
alignment.c
diff --git
a/arch/arm/mm/alignment.c
b/arch/arm/mm/alignment.c
index 00b7f7de28a182c849249a242fb0ecd2d68b09ca..7d5f4c736a16b4c1f514d0c3ce768ede43f4cef1 100644
(file)
--- a/
arch/arm/mm/alignment.c
+++ b/
arch/arm/mm/alignment.c
@@
-803,7
+803,7
@@
do_alignment(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
}
}
} else {
- fault = probe_kernel_address(instrptr, instr);
+ fault = probe_kernel_address(
(void *)
instrptr, instr);
instr = __mem_to_opcode_arm(instr);
}