2 files changed, 8 insertions, 8 deletions

diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
index edb5a406922f..f65750a3d28b 100644
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@ -142,7 +142,7 @@ int __cpuinit __cpu_up(unsigned int cpu)
                         ret = -EIO;
         }
 
-        secondary_data.stack = 0;
+        secondary_data.stack = NULL;
         secondary_data.pgdir = 0;
 
         *pmd_offset(pgd, PHYS_OFFSET) = __pmd(0);
@@ -359,8 +359,8 @@ static void send_ipi_message(cpumask_t callmap, enum ipi_msg_type msg)
  * You must not call this function with disabled interrupts, from a
  * hardware interrupt handler, nor from a bottom half handler.
  */
-int smp_call_function_on_cpu(void (*func)(void *info), void *info, int retry,
-                             int wait, cpumask_t callmap)
+static int smp_call_function_on_cpu(void (*func)(void *info), void *info,
+                                    int retry, int wait, cpumask_t callmap)
 {
         struct smp_call_struct data;
         unsigned long timeout;
diff --git a/arch/arm/mach-realview/platsmp.c b/arch/arm/mach-realview/platsmp.c
index 9844644d0fb5..09b35f62247a 100644
--- a/arch/arm/mach-realview/platsmp.c
+++ b/arch/arm/mach-realview/platsmp.c
@@ -32,7 +32,7 @@ static unsigned int __init get_core_count(void)
 {
         unsigned int ncores;
 
-        ncores = __raw_readl(IO_ADDRESS(REALVIEW_MPCORE_SCU_BASE) + SCU_CONFIG);
+        ncores = __raw_readl(__io_address(REALVIEW_MPCORE_SCU_BASE) + SCU_CONFIG);
 
         return (ncores & 0x03) + 1;
 }
@@ -133,12 +133,12 @@ static void __init poke_milo(void)
 #if 1
 #define REALVIEW_SYS_FLAGSS_OFFSET 0x30
         __raw_writel(virt_to_phys(realview_secondary_startup),
-                     (IO_ADDRESS(REALVIEW_SYS_BASE) +
-                      REALVIEW_SYS_FLAGSS_OFFSET));
+                     __io_address(REALVIEW_SYS_BASE) +
+                     REALVIEW_SYS_FLAGSS_OFFSET);
 #define REALVIEW_SYS_FLAGSC_OFFSET 0x34
         __raw_writel(3,
-                     (IO_ADDRESS(REALVIEW_SYS_BASE) +
-                      REALVIEW_SYS_FLAGSC_OFFSET));
+                     __io_address(REALVIEW_SYS_BASE) +
+                     REALVIEW_SYS_FLAGSC_OFFSET);
 #endif
 
         mb();