1 files changed, 10 insertions, 12 deletions

diff --git a/arch/sparc/mm/sun4c.c b/arch/sparc/mm/sun4c.c
index 4289f90f8697..1cf4f198709a 100644
--- a/arch/sparc/mm/sun4c.c
+++ b/arch/sparc/mm/sun4c.c
@@ -318,7 +318,7 @@ void __init sun4c_probe_vac(void)
                 prom_printf("probe_vac: Didn't expect vac-linesize of %d, halting\n",
                             sun4c_vacinfo.linesize);
                 prom_halt();
-        };
+        }
 
         sun4c_flush_all();
         sun4c_enable_vac();
@@ -364,7 +364,7 @@ static void __init patch_kernel_fault_handler(void)
                         prom_printf("Unhandled number of segmaps: %d\n",
                                     num_segmaps);
                         prom_halt();
-        };
+        }
         switch (num_contexts) {
                 case 8:
                         /* Default, nothing to do. */
@@ -377,7 +377,7 @@ static void __init patch_kernel_fault_handler(void)
                         prom_printf("Unhandled number of contexts: %d\n",
                                     num_contexts);
                         prom_halt();
-        };
+        }
 
         if (sun4c_vacinfo.do_hwflushes != 0) {
                 PATCH_INSN(vac_hwflush_patch1_on, vac_hwflush_patch1);
@@ -394,7 +394,7 @@ static void __init patch_kernel_fault_handler(void)
                         prom_printf("Impossible VAC linesize %d, halting...\n",
                                     sun4c_vacinfo.linesize);
                         prom_halt();
-                };
+                }
         }
 }
 
@@ -420,7 +420,7 @@ volatile unsigned long __iomem *sun4c_memerr_reg = NULL;
 
 void __init sun4c_probe_memerr_reg(void)
 {
-        int node;
+        phandle node;
         struct linux_prom_registers regs[1];
 
         node = prom_getchild(prom_root_node);
@@ -435,16 +435,14 @@ void __init sun4c_probe_memerr_reg(void)
 
 static inline void sun4c_init_ss2_cache_bug(void)
 {
-        extern unsigned long start;
-
         if ((idprom->id_machtype == (SM_SUN4C | SM_4C_SS2)) ||
             (idprom->id_machtype == (SM_SUN4C | SM_4C_IPX)) ||
             (idprom->id_machtype == (SM_SUN4C | SM_4C_ELC))) {
                 /* Whee.. */
                 printk("SS2 cache bug detected, uncaching trap table page\n");
-                sun4c_flush_page((unsigned int) &start);
-                sun4c_put_pte(((unsigned long) &start),
-                        (sun4c_get_pte((unsigned long) &start) | _SUN4C_PAGE_NOCACHE));
+                sun4c_flush_page((unsigned int) &_start);
+                sun4c_put_pte(((unsigned long) &_start),
+                        (sun4c_get_pte((unsigned long) &_start) | _SUN4C_PAGE_NOCACHE));
         }
 }
 
@@ -924,7 +922,7 @@ static inline void garbage_collect(int entry)
         free_locked_segment(BUCKET_ADDR(entry));
 }
 
-static struct thread_info *sun4c_alloc_thread_info(void)
+static struct thread_info *sun4c_alloc_thread_info_node(int node)
 {
         unsigned long addr, pages;
         int entry;
@@ -2157,7 +2155,7 @@ void __init ld_mmu_sun4c(void)
         BTFIXUPSET_CALL(__swp_offset, sun4c_swp_offset, BTFIXUPCALL_NORM);
         BTFIXUPSET_CALL(__swp_entry, sun4c_swp_entry, BTFIXUPCALL_NORM);
 
-        BTFIXUPSET_CALL(alloc_thread_info, sun4c_alloc_thread_info, BTFIXUPCALL_NORM);
+        BTFIXUPSET_CALL(alloc_thread_info_node, sun4c_alloc_thread_info_node, BTFIXUPCALL_NORM);
         BTFIXUPSET_CALL(free_thread_info, sun4c_free_thread_info, BTFIXUPCALL_NORM);
 
         BTFIXUPSET_CALL(mmu_info, sun4c_mmu_info, BTFIXUPCALL_NORM);