summaryrefslogtreecommitdiff
path: root/arch/sparc/mm/fault_32.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-05-04 14:41:51 +0100
committerMark Brown <broonie@kernel.org>2016-05-04 14:41:51 +0100
commit3d277b177918cd26215732fc23af0783ab4b37dd (patch)
tree2033b4f517415e9e68eb066fa073b79a3884e03d /arch/sparc/mm/fault_32.c
parentf55532a0c0b8bb6148f4e07853b876ef73bc69ca (diff)
parent02da2d72174c61988eb4456b53f405e3ebdebce4 (diff)
Merge tag 'v4.6-rc5' into spi-rockchip
Linux 4.6-rc5
Diffstat (limited to 'arch/sparc/mm/fault_32.c')
-rw-r--r--arch/sparc/mm/fault_32.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c
index c399e7b3b035..b6c559cbd64d 100644
--- a/arch/sparc/mm/fault_32.c
+++ b/arch/sparc/mm/fault_32.c
@@ -303,10 +303,10 @@ no_context:
fixup = search_extables_range(regs->pc, &g2);
/* Values below 10 are reserved for other things */
if (fixup > 10) {
- extern const unsigned __memset_start[];
- extern const unsigned __memset_end[];
- extern const unsigned __csum_partial_copy_start[];
- extern const unsigned __csum_partial_copy_end[];
+ extern const unsigned int __memset_start[];
+ extern const unsigned int __memset_end[];
+ extern const unsigned int __csum_partial_copy_start[];
+ extern const unsigned int __csum_partial_copy_end[];
#ifdef DEBUG_EXCEPTIONS
printk("Exception: PC<%08lx> faddr<%08lx>\n",