9 files changed, 18 insertions, 26 deletions

diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index b18d24d249fa..2667a9dee11d 100644
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -10,6 +10,7 @@ config SPARC
         default y
         select HAVE_OPROFILE
         select HAVE_KPROBES
+        select HAVE_KRETPROBES
 
 config SPARC64
         bool
diff --git a/arch/sparc64/kernel/cpu.c b/arch/sparc64/kernel/cpu.c
index e43db73f2b91..dd5d28e3d798 100644
--- a/arch/sparc64/kernel/cpu.c
+++ b/arch/sparc64/kernel/cpu.c
@@ -30,7 +30,7 @@ struct cpu_fp_info {
   char* fp_name;
 };
 
-struct cpu_fp_info linux_sparc_fpu[] = {
+static struct cpu_fp_info linux_sparc_fpu[] = {
   { 0x17, 0x10, 0, "UltraSparc I integrated FPU"},
   { 0x22, 0x10, 0, "UltraSparc I integrated FPU"},
   { 0x17, 0x11, 0, "UltraSparc II integrated FPU"},
@@ -46,7 +46,7 @@ struct cpu_fp_info linux_sparc_fpu[] = {
 
 #define NSPARCFPU  ARRAY_SIZE(linux_sparc_fpu)
 
-struct cpu_iu_info linux_sparc_chips[] = {
+static struct cpu_iu_info linux_sparc_chips[] = {
   { 0x17, 0x10, "TI UltraSparc I   (SpitFire)"},
   { 0x22, 0x10, "TI UltraSparc I   (SpitFire)"},
   { 0x17, 0x11, "TI UltraSparc II  (BlackBird)"},
diff --git a/arch/sparc64/kernel/ds.c b/arch/sparc64/kernel/ds.c
index eeb5a2fc788d..bd76482077be 100644
--- a/arch/sparc64/kernel/ds.c
+++ b/arch/sparc64/kernel/ds.c
@@ -525,10 +525,10 @@ static void dr_cpu_mark(struct ds_data *resp, int cpu, int ncpus,
         }
 }
 
-static int dr_cpu_configure(struct ds_info *dp,
-                            struct ds_cap_state *cp,
-                            u64 req_num,
-                            cpumask_t *mask)
+static int __cpuinit dr_cpu_configure(struct ds_info *dp,
+                                      struct ds_cap_state *cp,
+                                      u64 req_num,
+                                      cpumask_t *mask)
 {
         struct ds_data *resp;
         int resp_len, ncpus, cpu;
@@ -623,9 +623,9 @@ static int dr_cpu_unconfigure(struct ds_info *dp,
         return 0;
 }
 
-static void dr_cpu_data(struct ds_info *dp,
-                        struct ds_cap_state *cp,
-                        void *buf, int len)
+static void __cpuinit dr_cpu_data(struct ds_info *dp,
+                                  struct ds_cap_state *cp,
+                                  void *buf, int len)
 {
         struct ds_data *data = buf;
         struct dr_cpu_tag *tag = (struct dr_cpu_tag *) (data + 1);
diff --git a/arch/sparc64/kernel/mdesc.c b/arch/sparc64/kernel/mdesc.c
index 856659bb1311..910083589569 100644
--- a/arch/sparc64/kernel/mdesc.c
+++ b/arch/sparc64/kernel/mdesc.c
@@ -758,7 +758,7 @@ static void __devinit get_mondo_data(struct mdesc_handle *hp, u64 mp,
         get_one_mondo_bits(val, &tb->nonresum_qmask, 2);
 }
 
-void __devinit mdesc_fill_in_cpu_data(cpumask_t mask)
+void __cpuinit mdesc_fill_in_cpu_data(cpumask_t mask)
 {
         struct mdesc_handle *hp = mdesc_grab();
         u64 mp;
diff --git a/arch/sparc64/kernel/process.c b/arch/sparc64/kernel/process.c
index 2aafce7dfc0e..e116e38b160e 100644
--- a/arch/sparc64/kernel/process.c
+++ b/arch/sparc64/kernel/process.c
@@ -114,8 +114,6 @@ void cpu_idle(void)
         }
 }
 
-extern char reboot_command [];
-
 void machine_halt(void)
 {
         sstate_halt();
diff --git a/arch/sparc64/mm/fault.c b/arch/sparc64/mm/fault.c
index e2027f27c0fe..2650d0d33ac2 100644
--- a/arch/sparc64/mm/fault.c
+++ b/arch/sparc64/mm/fault.c
@@ -244,16 +244,8 @@ static void do_kernel_fault(struct pt_regs *regs, int si_code, int fault_code,
         if (regs->tstate & TSTATE_PRIV) {
                 const struct exception_table_entry *entry;
 
-                if (asi == ASI_P && (insn & 0xc0800000) == 0xc0800000) {
-                        if (insn & 0x2000)
-                                asi = (regs->tstate >> 24);
-                        else
-                                asi = (insn >> 5);
-                }
-        
-                /* Look in asi.h: All _S asis have LS bit set */
-                if ((asi & 0x1) &&
-                    (entry = search_exception_tables(regs->tpc))) {
+                entry = search_exception_tables(regs->tpc);
+                if (entry) {
                         regs->tpc = entry->fixup;
                         regs->tnpc = regs->tpc + 4;
                         return;
@@ -294,7 +286,7 @@ asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
                 unsigned long tpc = regs->tpc;
 
                 /* Sanity check the PC. */
-                if ((tpc >= KERNBASE && tpc < (unsigned long) _etext) ||
+                if ((tpc >= KERNBASE && tpc < (unsigned long) __init_end) ||
                     (tpc >= MODULES_VADDR && tpc < MODULES_END)) {
                         /* Valid, no problems... */
                 } else {
diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c
index 9e6bca266d88..b5c30416fdac 100644
--- a/arch/sparc64/mm/init.c
+++ b/arch/sparc64/mm/init.c
@@ -1010,7 +1010,8 @@ static struct linux_prom64_registers pall[MAX_BANKS] __initdata;
 static int pall_ents __initdata;
 
 #ifdef CONFIG_DEBUG_PAGEALLOC
-static unsigned long kernel_map_range(unsigned long pstart, unsigned long pend, pgprot_t prot)
+static unsigned long __ref kernel_map_range(unsigned long pstart,
+                                            unsigned long pend, pgprot_t prot)
 {
         unsigned long vstart = PAGE_OFFSET + pstart;
         unsigned long vend = PAGE_OFFSET + pend;
diff --git a/arch/sparc64/solaris/conv.h b/arch/sparc64/solaris/conv.h
index 5faf59a9de39..50e58232cf2b 100644
--- a/arch/sparc64/solaris/conv.h
+++ b/arch/sparc64/solaris/conv.h
@@ -28,7 +28,7 @@ extern unsigned sunos_sys_table[];
 #define SUNOS(x) ((long)sunos_sys_table[x])
 
 #ifdef DEBUG_SOLARIS
-#define SOLD(s) printk("%s,%d,%s(): %s\n",__FILE__,__LINE__,__FUNCTION__,(s))
+#define SOLD(s) printk("%s,%d,%s(): %s\n",__FILE__,__LINE__,__func__,(s))
 #define SOLDD(s) printk("solaris: "); printk s
 #else
 #define SOLD(s)
diff --git a/arch/sparc64/solaris/timod.c b/arch/sparc64/solaris/timod.c
index f53123c02c2b..15234fcd191a 100644
--- a/arch/sparc64/solaris/timod.c
+++ b/arch/sparc64/solaris/timod.c
@@ -81,7 +81,7 @@ void mykfree(void *p)
 #define MKCTL_MAGIC     0xDEADBABEBADC0DEDL
 #define PUT_MAGIC(a,m)  do{(*(u64*)(a))=(m);}while(0)
 #define SCHECK_MAGIC(a,m)       do{if((*(u64*)(a))!=(m))printk("%s,%u,%s(): magic %08x at %p corrupted!\n",\
-                                __FILE__,__LINE__,__FUNCTION__,(m),(a));}while(0)
+                                __FILE__,__LINE__,__func__,(m),(a));}while(0)
 #define BUF_OFFSET      sizeof(u64)
 #define MKCTL_TRAILER   sizeof(u64)