3 files changed, 10 insertions, 10 deletions

diff --git a/arch/mips/bcm63xx/prom.c b/arch/mips/bcm63xx/prom.c
index 77a836e661c9..df69eaa453a1 100644
--- a/arch/mips/bcm63xx/prom.c
+++ b/arch/mips/bcm63xx/prom.c
@@ -84,7 +84,7 @@ void __init prom_init(void)
                  * Here we will start up CPU1 in the background and ask it to
                  * reconfigure itself then go back to sleep.
                  */
-                memcpy((void *)0xa0000200, &bmips_smp_movevec, 0x20);
+                memcpy((void *)0xa0000200, bmips_smp_movevec, 0x20);
                 __sync();
                 set_c0_cause(C_SW0);
                 cpumask_set_cpu(1, &bmips_booted_mask);
diff --git a/arch/mips/include/asm/bmips.h b/arch/mips/include/asm/bmips.h
index bf6a8afd7ad2..581a6a3c66e4 100644
--- a/arch/mips/include/asm/bmips.h
+++ b/arch/mips/include/asm/bmips.h
@@ -75,11 +75,11 @@ static inline int register_bmips_smp_ops(void)
 #endif
 }
 
-extern char bmips_reset_nmi_vec;
-extern char bmips_reset_nmi_vec_end;
-extern char bmips_smp_movevec;
-extern char bmips_smp_int_vec;
-extern char bmips_smp_int_vec_end;
+extern char bmips_reset_nmi_vec[];
+extern char bmips_reset_nmi_vec_end[];
+extern char bmips_smp_movevec[];
+extern char bmips_smp_int_vec[];
+extern char bmips_smp_int_vec_end[];
 
 extern int bmips_smp_enabled;
 extern int bmips_cpu_offset;
diff --git a/arch/mips/kernel/smp-bmips.c b/arch/mips/kernel/smp-bmips.c
index 76fae9b79f13..712c15de6ab9 100644
--- a/arch/mips/kernel/smp-bmips.c
+++ b/arch/mips/kernel/smp-bmips.c
@@ -464,10 +464,10 @@ static void bmips_wr_vec(unsigned long dst, char *start, char *end)
 
 static inline void bmips_nmi_handler_setup(void)
 {
-        bmips_wr_vec(BMIPS_NMI_RESET_VEC, &bmips_reset_nmi_vec,
-                &bmips_reset_nmi_vec_end);
-        bmips_wr_vec(BMIPS_WARM_RESTART_VEC, &bmips_smp_int_vec,
-                &bmips_smp_int_vec_end);
+        bmips_wr_vec(BMIPS_NMI_RESET_VEC, bmips_reset_nmi_vec,
+                bmips_reset_nmi_vec_end);
+        bmips_wr_vec(BMIPS_WARM_RESTART_VEC, bmips_smp_int_vec,
+                bmips_smp_int_vec_end);
 }
 
 struct reset_vec_info {