1 files changed, 40 insertions, 9 deletions

diff --git a/arch/sparc64/kernel/smp.c b/arch/sparc64/kernel/smp.c
index 59f020d69d4c..3aba47624df4 100644
--- a/arch/sparc64/kernel/smp.c
+++ b/arch/sparc64/kernel/smp.c
@@ -20,7 +20,7 @@
 #include <linux/cache.h>
 #include <linux/jiffies.h>
 #include <linux/profile.h>
-#include <linux/bootmem.h>
+#include <linux/lmb.h>
 
 #include <asm/head.h>
 #include <asm/ptrace.h>
@@ -38,7 +38,6 @@
 #include <asm/pgtable.h>
 #include <asm/oplib.h>
 #include <asm/uaccess.h>
-#include <asm/timer.h>
 #include <asm/starfire.h>
 #include <asm/tlb.h>
 #include <asm/sections.h>
@@ -866,14 +865,21 @@ void smp_call_function_client(int irq, struct pt_regs *regs)
         void *info = call_data->info;
 
         clear_softint(1 << irq);
+
+        irq_enter();
+
+        if (!call_data->wait) {
+                /* let initiator proceed after getting data */
+                atomic_inc(&call_data->finished);
+        }
+
+        func(info);
+
+        irq_exit();
+
         if (call_data->wait) {
                 /* let initiator proceed only after completion */
-                func(info);
-                atomic_inc(&call_data->finished);
-        } else {
-                /* let initiator proceed after getting data */
                 atomic_inc(&call_data->finished);
-                func(info);
         }
 }
 
@@ -903,6 +909,9 @@ extern unsigned long xcall_flush_tlb_kernel_range;
 extern unsigned long xcall_report_regs;
 extern unsigned long xcall_receive_signal;
 extern unsigned long xcall_new_mmu_context_version;
+#ifdef CONFIG_KGDB
+extern unsigned long xcall_kgdb_capture;
+#endif
 
 #ifdef DCACHE_ALIASING_POSSIBLE
 extern unsigned long xcall_flush_dcache_page_cheetah;
@@ -1032,7 +1041,9 @@ void smp_receive_signal(int cpu)
 
 void smp_receive_signal_client(int irq, struct pt_regs *regs)
 {
+        irq_enter();
         clear_softint(1 << irq);
+        irq_exit();
 }
 
 void smp_new_mmu_context_version_client(int irq, struct pt_regs *regs)
@@ -1040,6 +1051,8 @@ void smp_new_mmu_context_version_client(int irq, struct pt_regs *regs)
         struct mm_struct *mm;
         unsigned long flags;
 
+        irq_enter();
+
         clear_softint(1 << irq);
 
         /* See if we need to allocate a new TLB context because
@@ -1059,6 +1072,8 @@ void smp_new_mmu_context_version_client(int irq, struct pt_regs *regs)
         load_secondary_context(mm);
         __flush_tlb_mm(CTX_HWBITS(mm->context),
                        SECONDARY_CONTEXT);
+
+        irq_exit();
 }
 
 void smp_new_mmu_context_version(void)
@@ -1066,6 +1081,13 @@ void smp_new_mmu_context_version(void)
         smp_cross_call(&xcall_new_mmu_context_version, 0, 0, 0);
 }
 
+#ifdef CONFIG_KGDB
+void kgdb_roundup_cpus(unsigned long flags)
+{
+        smp_cross_call(&xcall_kgdb_capture, 0, 0, 0);
+}
+#endif
+
 void smp_report_regs(void)
 {
         smp_cross_call(&xcall_report_regs, 0, 0, 0);
@@ -1217,6 +1239,8 @@ void smp_penguin_jailcell(int irq, struct pt_regs *regs)
 {
         clear_softint(1 << irq);
 
+        irq_enter();
+
         preempt_disable();
 
         __asm__ __volatile__("flushw");
@@ -1229,6 +1253,8 @@ void smp_penguin_jailcell(int irq, struct pt_regs *regs)
         prom_world(0);
 
         preempt_enable();
+
+        irq_exit();
 }
 
 /* /proc/profile writes can call this, don't __init it please. */
@@ -1431,7 +1457,7 @@ EXPORT_SYMBOL(__per_cpu_shift);
 
 void __init real_setup_per_cpu_areas(void)
 {
-        unsigned long goal, size, i;
+        unsigned long paddr, goal, size, i;
         char *ptr;
 
         /* Copy section for each CPU (we discard the original) */
@@ -1441,8 +1467,13 @@ void __init real_setup_per_cpu_areas(void)
         for (size = PAGE_SIZE; size < goal; size <<= 1UL)
                 __per_cpu_shift++;
 
-        ptr = alloc_bootmem_pages(size * NR_CPUS);
+        paddr = lmb_alloc(size * NR_CPUS, PAGE_SIZE);
+        if (!paddr) {
+                prom_printf("Cannot allocate per-cpu memory.\n");
+                prom_halt();
+        }
 
+        ptr = __va(paddr);
         __per_cpu_base = ptr - __per_cpu_start;
 
         for (i = 0; i < NR_CPUS; i++, ptr += size)