Merge commit 'origin/master' into next

Conflicts:
	include/linux/kvm.h

1 files changed, 10 insertions, 0 deletions

diff --git a/arch/sparc/kernel/smp_32.c b/arch/sparc/kernel/smp_32.c
index 132d81fb261..91c10fb7085 100644
--- a/arch/sparc/kernel/smp_32.c
+++ b/arch/sparc/kernel/smp_32.c
@@ -32,6 +32,7 @@
 #include <asm/cacheflush.h>
 #include <asm/tlbflush.h>
 #include <asm/cpudata.h>
+#include <asm/leon.h>
 
 #include "irq.h"
 
@@ -96,6 +97,9 @@ void __init smp_cpus_done(unsigned int max_cpus)
         case sun4d:
                 smp4d_smp_done();
                 break;
+        case sparc_leon:
+                leon_smp_done();
+                break;
         case sun4e:
                 printk("SUN4E\n");
                 BUG();
@@ -306,6 +310,9 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
         case sun4d:
                 smp4d_boot_cpus();
                 break;
+        case sparc_leon:
+                leon_boot_cpus();
+                break;
         case sun4e:
                 printk("SUN4E\n");
                 BUG();
@@ -376,6 +383,9 @@ int __cpuinit __cpu_up(unsigned int cpu)
         case sun4d:
                 ret = smp4d_boot_one_cpu(cpu);
                 break;
+        case sparc_leon:
+                ret = leon_boot_one_cpu(cpu);
+                break;
         case sun4e:
                 printk("SUN4E\n");
                 BUG();