13 files changed, 23 insertions, 149 deletions

diff --git a/arch/sparc64/kernel/hvtramp.S b/arch/sparc64/kernel/hvtramp.S
index b692e044a463..0236c43772fa 100644
--- a/arch/sparc64/kernel/hvtramp.S
+++ b/arch/sparc64/kernel/hvtramp.S
@@ -3,6 +3,8 @@
  * Copyright (C) 2007 David S. Miller <davem@davemloft.net>
  */
 
+#include <linux/init.h>
+
 #include <asm/thread_info.h>
 #include <asm/hypervisor.h>
 #include <asm/scratchpad.h>
@@ -13,7 +15,7 @@
 #include <asm/head.h>
 #include <asm/asi.h>
 
-        .text
+        __CPUINIT
         .align          8
         .globl          hv_cpu_startup, hv_cpu_startup_end
 
diff --git a/arch/sparc64/kernel/iommu.c b/arch/sparc64/kernel/iommu.c
index d3276ebcfb47..fbaab3497bfd 100644
--- a/arch/sparc64/kernel/iommu.c
+++ b/arch/sparc64/kernel/iommu.c
@@ -134,7 +134,8 @@ unsigned long iommu_range_alloc(struct device *dev,
         else
                 boundary_size = ALIGN(1UL << 32, 1 << IO_PAGE_SHIFT);
 
-        n = iommu_area_alloc(arena->map, limit, start, npages, 0,
+        n = iommu_area_alloc(arena->map, limit, start, npages,
+                             iommu->page_table_map_base >> IO_PAGE_SHIFT,
                              boundary_size >> IO_PAGE_SHIFT, 0);
         if (n == -1) {
                 if (likely(pass < 1)) {
@@ -200,12 +201,11 @@ int iommu_table_init(struct iommu *iommu, int tsbsize,
         /* Allocate and initialize the dummy page which we
          * set inactive IO PTEs to point to.
          */
-        iommu->dummy_page = __get_free_pages(GFP_KERNEL, 0);
+        iommu->dummy_page = get_zeroed_page(GFP_KERNEL);
         if (!iommu->dummy_page) {
                 printk(KERN_ERR "IOMMU: Error, gfp(dummy_page) failed.\n");
                 goto out_free_map;
         }
-        memset((void *)iommu->dummy_page, 0, PAGE_SIZE);
         iommu->dummy_page_pa = (unsigned long) __pa(iommu->dummy_page);
 
         /* Now allocate and setup the IOMMU page table itself.  */
diff --git a/arch/sparc64/kernel/kprobes.c b/arch/sparc64/kernel/kprobes.c
index 34fc3ddd5002..f43b5d755354 100644
--- a/arch/sparc64/kernel/kprobes.c
+++ b/arch/sparc64/kernel/kprobes.c
@@ -465,8 +465,6 @@ void __kprobes jprobe_return(void)
 
 extern void jprobe_return_trap_instruction(void);
 
-extern void __show_regs(struct pt_regs * regs);
-
 int __kprobes longjmp_break_handler(struct kprobe *p, struct pt_regs *regs)
 {
         u32 *addr = (u32 *) regs->tpc;
diff --git a/arch/sparc64/kernel/pci.c b/arch/sparc64/kernel/pci.c
index a61c38fe75ea..545356b00e2e 100644
--- a/arch/sparc64/kernel/pci.c
+++ b/arch/sparc64/kernel/pci.c
@@ -225,20 +225,6 @@ static int __init pci_controller_init(const char *model_name, int namelen, struc
         return 0;
 }
 
-static int __init pci_is_controller(const char *model_name, int namelen, struct device_node *dp)
-{
-        int i;
-
-        for (i = 0; i < PCI_NUM_CONTROLLER_TYPES; i++) {
-                if (!strncmp(model_name,
-                             pci_controller_table[i].model_name,
-                             namelen)) {
-                        return 1;
-                }
-        }
-        return 0;
-}
-
 static int __init pci_controller_scan(int (*handler)(const char *, int, struct device_node *))
 {
         struct device_node *dp;
@@ -273,13 +259,6 @@ static int __init pci_controller_scan(int (*handler)(const char *, int, struct d
         return count;
 }
 
-
-/* Is there some PCI controller in the system?  */
-int __init pcic_present(void)
-{
-        return pci_controller_scan(pci_is_controller);
-}
-
 /* Find each controller in the system, attach and initialize
  * software state structure for each and link into the
  * pci_pbm_root.  Setup the controller enough such
diff --git a/arch/sparc64/kernel/power.c b/arch/sparc64/kernel/power.c
index 850cdffdd69c..eae8ca2a6ba5 100644
--- a/arch/sparc64/kernel/power.c
+++ b/arch/sparc64/kernel/power.c
@@ -20,6 +20,7 @@
 #include <asm/of_device.h>
 #include <asm/io.h>
 #include <asm/sstate.h>
+#include <asm/reboot.h>
 
 #include <linux/unistd.h>
 
@@ -39,8 +40,6 @@ static irqreturn_t power_handler(int irq, void *dev_id)
         return IRQ_HANDLED;
 }
 
-extern void machine_halt(void);
-extern void machine_alt_power_off(void);
 static void (*poweroff_method)(void) = machine_alt_power_off;
 
 void machine_power_off(void)
diff --git a/arch/sparc64/kernel/process.c b/arch/sparc64/kernel/process.c
index 1b2379174988..2aafce7dfc0e 100644
--- a/arch/sparc64/kernel/process.c
+++ b/arch/sparc64/kernel/process.c
@@ -30,6 +30,7 @@
 #include <linux/tick.h>
 #include <linux/init.h>
 #include <linux/cpu.h>
+#include <linux/elfcore.h>
 
 #include <asm/oplib.h>
 #include <asm/uaccess.h>
@@ -47,6 +48,8 @@
 #include <asm/unistd.h>
 #include <asm/hypervisor.h>
 #include <asm/sstate.h>
+#include <asm/reboot.h>
+#include <asm/syscalls.h>
 
 /* #define VERBOSE_SHOWREGS */
 
@@ -113,16 +116,9 @@ void cpu_idle(void)
 
 extern char reboot_command [];
 
-extern void (*prom_palette)(int);
-extern void (*prom_keyboard)(void);
-
 void machine_halt(void)
 {
         sstate_halt();
-        if (prom_palette)
-                prom_palette (1);
-        if (prom_keyboard)
-                prom_keyboard();
         prom_halt();
         panic("Halt failed!");
 }
@@ -130,10 +126,6 @@ void machine_halt(void)
 void machine_alt_power_off(void)
 {
         sstate_poweroff();
-        if (prom_palette)
-                prom_palette(1);
-        if (prom_keyboard)
-                prom_keyboard();
         prom_halt_power_off();
         panic("Power-off failed!");
 }
@@ -145,10 +137,6 @@ void machine_restart(char * cmd)
         sstate_reboot();
         p = strchr (reboot_command, '\n');
         if (p) *p = 0;
-        if (prom_palette)
-                prom_palette (1);
-        if (prom_keyboard)
-                prom_keyboard();
         if (cmd)
                 prom_reboot(cmd);
         if (*reboot_command)
@@ -226,62 +214,6 @@ static void show_regwindow(struct pt_regs *regs)
                 print_symbol("I7: <%s>\n", rwk->ins[7]);
 }
 
-void show_stackframe(struct sparc_stackf *sf)
-{
-        unsigned long size;
-        unsigned long *stk;
-        int i;
-
-        printk("l0: %016lx l1: %016lx l2: %016lx l3: %016lx\n"
-               "l4: %016lx l5: %016lx l6: %016lx l7: %016lx\n",
-               sf->locals[0], sf->locals[1], sf->locals[2], sf->locals[3],
-               sf->locals[4], sf->locals[5], sf->locals[6], sf->locals[7]);
-        printk("i0: %016lx i1: %016lx i2: %016lx i3: %016lx\n"
-               "i4: %016lx i5: %016lx fp: %016lx ret_pc: %016lx\n",
-               sf->ins[0], sf->ins[1], sf->ins[2], sf->ins[3],
-               sf->ins[4], sf->ins[5], (unsigned long)sf->fp, sf->callers_pc);
-        printk("sp: %016lx x0: %016lx x1: %016lx x2: %016lx\n"
-               "x3: %016lx x4: %016lx x5: %016lx xx: %016lx\n",
-               (unsigned long)sf->structptr, sf->xargs[0], sf->xargs[1],
-               sf->xargs[2], sf->xargs[3], sf->xargs[4], sf->xargs[5],
-               sf->xxargs[0]);
-        size = ((unsigned long)sf->fp) - ((unsigned long)sf);
-        size -= STACKFRAME_SZ;
-        stk = (unsigned long *)((unsigned long)sf + STACKFRAME_SZ);
-        i = 0;
-        do {
-                printk("s%d: %016lx\n", i++, *stk++);
-        } while ((size -= sizeof(unsigned long)));
-}
-
-void show_stackframe32(struct sparc_stackf32 *sf)
-{
-        unsigned long size;
-        unsigned *stk;
-        int i;
-
-        printk("l0: %08x l1: %08x l2: %08x l3: %08x\n",
-               sf->locals[0], sf->locals[1], sf->locals[2], sf->locals[3]);
-        printk("l4: %08x l5: %08x l6: %08x l7: %08x\n",
-               sf->locals[4], sf->locals[5], sf->locals[6], sf->locals[7]);
-        printk("i0: %08x i1: %08x i2: %08x i3: %08x\n",
-               sf->ins[0], sf->ins[1], sf->ins[2], sf->ins[3]);
-        printk("i4: %08x i5: %08x fp: %08x ret_pc: %08x\n",
-               sf->ins[4], sf->ins[5], sf->fp, sf->callers_pc);
-        printk("sp: %08x x0: %08x x1: %08x x2: %08x\n"
-               "x3: %08x x4: %08x x5: %08x xx: %08x\n",
-               sf->structptr, sf->xargs[0], sf->xargs[1],
-               sf->xargs[2], sf->xargs[3], sf->xargs[4], sf->xargs[5],
-               sf->xxargs[0]);
-        size = ((unsigned long)sf->fp) - ((unsigned long)sf);
-        size -= STACKFRAME32_SZ;
-        stk = (unsigned *)((unsigned long)sf + STACKFRAME32_SZ);
-        i = 0;
-        do {
-                printk("s%d: %08x\n", i++, *stk++);
-        } while ((size -= sizeof(unsigned)));
-}
-
 #ifdef CONFIG_SMP
 static DEFINE_SPINLOCK(regdump_lock);
 #endif
@@ -369,24 +301,6 @@ void show_regs(struct pt_regs *regs)
 #endif
 }
 
-void show_regs32(struct pt_regs32 *regs)
-{
-        printk("PSR: %08x PC: %08x NPC: %08x Y: %08x    %s\n", regs->psr,
-               regs->pc, regs->npc, regs->y, print_tainted());
-        printk("g0: %08x g1: %08x g2: %08x g3: %08x ",
-               regs->u_regs[0], regs->u_regs[1], regs->u_regs[2],
-               regs->u_regs[3]);
-        printk("g4: %08x g5: %08x g6: %08x g7: %08x\n",
-               regs->u_regs[4], regs->u_regs[5], regs->u_regs[6],
-               regs->u_regs[7]);
-        printk("o0: %08x o1: %08x o2: %08x o3: %08x ",
-               regs->u_regs[8], regs->u_regs[9], regs->u_regs[10],
-               regs->u_regs[11]);
-        printk("o4: %08x o5: %08x sp: %08x ret_pc: %08x\n",
-               regs->u_regs[12], regs->u_regs[13], regs->u_regs[14],
-               regs->u_regs[15]);
-}
-
 unsigned long thread_saved_pc(struct task_struct *tsk)
 {
         struct thread_info *ti = task_thread_info(tsk);
diff --git a/arch/sparc64/kernel/prom.c b/arch/sparc64/kernel/prom.c
index a246e962e5a7..68964ddcde1e 100644
--- a/arch/sparc64/kernel/prom.c
+++ b/arch/sparc64/kernel/prom.c
@@ -1716,7 +1716,6 @@ static void __init of_console_init(void)
 
         of_console_device = dp;
 
-        prom_printf(msg, of_console_path);
         printk(msg, of_console_path);
 }
 
diff --git a/arch/sparc64/kernel/setup.c b/arch/sparc64/kernel/setup.c
index 5964d8653ade..d036dbe72864 100644
--- a/arch/sparc64/kernel/setup.c
+++ b/arch/sparc64/kernel/setup.c
@@ -68,33 +68,22 @@ struct screen_info screen_info = {
         16                      /* orig-video-points */
 };
 
-void (*prom_palette)(int);
-void (*prom_keyboard)(void);
-
 static void
 prom_console_write(struct console *con, const char *s, unsigned n)
 {
         prom_write(s, n);
 }
 
-unsigned int boot_flags = 0;
-#define BOOTME_DEBUG  0x1
-
 /* Exported for mm/init.c:paging_init. */
 unsigned long cmdline_memory_size = 0;
 
-static struct console prom_debug_console = {
-        .name =         "debug",
+static struct console prom_early_console = {
+        .name =         "earlyprom",
         .write =        prom_console_write,
-        .flags =        CON_PRINTBUFFER,
+        .flags =        CON_PRINTBUFFER | CON_BOOT,
         .index =        -1,
 };
 
-/* XXX Implement this at some point... */
-void kernel_enter_debugger(void)
-{
-}
-
 /* 
  * Process kernel command line switches that are specific to the
  * SPARC or that require special low-level processing.
@@ -103,8 +92,6 @@ static void __init process_switch(char c)
 {
         switch (c) {
         case 'd':
-                boot_flags |= BOOTME_DEBUG;
-                break;
         case 's':
                 break;
         case 'h':
@@ -112,8 +99,7 @@ static void __init process_switch(char c)
                 prom_halt();
                 break;
         case 'p':
-                /* Use PROM debug console. */
-                register_console(&prom_debug_console);
+                /* Just ignore, this behavior is now the default.  */
                 break;
         case 'P':
                 /* Force UltraSPARC-III P-Cache on. */
@@ -168,8 +154,6 @@ static void __init boot_flags_init(char *commands)
         }
 }
 
-extern void panic_setup(char *, int *);
-
 extern unsigned short root_flags;
 extern unsigned short root_dev;
 extern unsigned short ram_flags;
@@ -296,6 +280,9 @@ void __init setup_arch(char **cmdline_p)
         *cmdline_p = prom_getbootargs();
         strcpy(boot_command_line, *cmdline_p);
 
+        boot_flags_init(*cmdline_p);
+        register_console(&prom_early_console);
+
         if (tlb_type == hypervisor)
                 printk("ARCH: SUN4V\n");
         else
@@ -307,8 +294,6 @@ void __init setup_arch(char **cmdline_p)
         conswitchp = &prom_con;
 #endif
 
-        boot_flags_init(*cmdline_p);
-
         idprom_init();
 
         if (!root_flags)
diff --git a/arch/sparc64/kernel/smp.c b/arch/sparc64/kernel/smp.c
index a8052b76df41..cc454731d879 100644
--- a/arch/sparc64/kernel/smp.c
+++ b/arch/sparc64/kernel/smp.c
@@ -86,7 +86,7 @@ extern void setup_sparc64_timer(void);
 
 static volatile unsigned long callin_flag = 0;
 
-void __devinit smp_callin(void)
+void __cpuinit smp_callin(void)
 {
         int cpuid = hard_smp_processor_id();
 
diff --git a/arch/sparc64/kernel/sparc64_ksyms.c b/arch/sparc64/kernel/sparc64_ksyms.c
index 68db08930399..51fa773f38c9 100644
--- a/arch/sparc64/kernel/sparc64_ksyms.c
+++ b/arch/sparc64/kernel/sparc64_ksyms.c
@@ -85,7 +85,6 @@ extern int (*handle_mathemu)(struct pt_regs *, struct fpustate *);
 extern long sparc32_open(const char __user * filename, int flags, int mode);
 extern int io_remap_pfn_range(struct vm_area_struct *vma, unsigned long from,
         unsigned long pfn, unsigned long size, pgprot_t prot);
-extern void (*prom_palette)(int);
 
 extern int __ashrdi3(int, int);
 
@@ -355,5 +354,3 @@ EXPORT_SYMBOL(xor_niagara_2);
 EXPORT_SYMBOL(xor_niagara_3);
 EXPORT_SYMBOL(xor_niagara_4);
 EXPORT_SYMBOL(xor_niagara_5);
-
-EXPORT_SYMBOL(prom_palette);
diff --git a/arch/sparc64/kernel/trampoline.S b/arch/sparc64/kernel/trampoline.S
index 04e81dda13d0..4ae2e525d68b 100644
--- a/arch/sparc64/kernel/trampoline.S
+++ b/arch/sparc64/kernel/trampoline.S
@@ -4,6 +4,8 @@
  * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu)
  */
 
+#include <linux/init.h>
+
 #include <asm/head.h>
 #include <asm/asi.h>
 #include <asm/lsu.h>
@@ -36,7 +38,7 @@ dtlb_load:
 tramp_stack:
         .skip   TRAMP_STACK_SIZE
 
-        .text
+        __CPUINIT
         .align          8
         .globl          sparc64_cpu_startup, sparc64_cpu_startup_end
 sparc64_cpu_startup:
diff --git a/arch/sparc64/kernel/traps.c b/arch/sparc64/kernel/traps.c
index 2b6abf633343..007f5317c0de 100644
--- a/arch/sparc64/kernel/traps.c
+++ b/arch/sparc64/kernel/traps.c
@@ -1791,8 +1791,6 @@ static const char *sun4v_err_type_to_str(u32 type)
         };
 }
 
-extern void __show_regs(struct pt_regs * regs);
-
 static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent, int cpu, const char *pfx, atomic_t *ocnt)
 {
         int cnt;
diff --git a/arch/sparc64/kernel/unaligned.c b/arch/sparc64/kernel/unaligned.c
index dc7bf1b6321c..1a511e9f0d3e 100644
--- a/arch/sparc64/kernel/unaligned.c
+++ b/arch/sparc64/kernel/unaligned.c
@@ -7,6 +7,7 @@
  */
 
 
+#include <linux/jiffies.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
@@ -283,7 +284,7 @@ static void log_unaligned(struct pt_regs *regs)
 {
         static unsigned long count, last_time;
 
-        if (jiffies - last_time > 5 * HZ)
+        if (time_after(jiffies, last_time + 5 * HZ))
                 count = 0;
         if (count < 5) {
                 last_time = jiffies;