[Meego-kernel] [patch] stop doing SMP alternatives on MRST

[Arjan van de Ven]

diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
index 9495ac1..52b8871 100644
On MRST, we go into and out of SMP mode all the time... it's just not 
worth patching the code in and out with that.

Signed-off-by: Arjan van de Ven <ar...@linux.intel.com>

--- a/arch/x86/kernel/alternative.c
+++ b/arch/x86/kernel/alternative.c
@@ -44,7 +44,7 @@ static int __init debug_alt(char *str)
 }
 __setup("debug-alternative", debug_alt);

-static int noreplace_smp;
+int noreplace_smp;

 static int __init setup_noreplace_smp(char *str)
 {
diff --git a/arch/x86/platform/mrst/mrst.c b/arch/x86/platform/mrst/mrst.c
index 99d3e22..c0809fa 100644
--- a/arch/x86/platform/mrst/mrst.c
+++ b/arch/x86/platform/mrst/mrst.c
@@ -46,6 +46,8 @@
 #include <asm/apb_timer.h>
 #include <asm/reboot.h>

+extern int noreplace_smp;
+
 /*
  * the clockevent devices on Moorestown/Medfield can be APBT or LAPIC 
clock,
  * cmdline option x86_mrst_timer can be used to override the configuration
@@ -1097,6 +1099,7 @@ static int __init sfi_parse_devs(struct 
sfi_table_header *table)

 static int __init mrst_platform_init(void)
 {
+    noreplace_smp = 1;
     sfi_table_parse(SFI_SIG_GPIO, NULL, NULL, sfi_parse_gpio);
     sfi_table_parse(SFI_SIG_DEVS, NULL, NULL, sfi_parse_devs);
     return 0;

diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
index 9495ac1..52b8871 100644
--- a/arch/x86/kernel/alternative.c
+++ b/arch/x86/kernel/alternative.c
@@ -44,7 +44,7 @@ static int __init debug_alt(char *str)
 }
 __setup("debug-alternative", debug_alt);
 
-static int noreplace_smp;
+int noreplace_smp;
 
 static int __init setup_noreplace_smp(char *str)
 {
diff --git a/arch/x86/platform/mrst/mrst.c b/arch/x86/platform/mrst/mrst.c
index 99d3e22..c0809fa 100644
--- a/arch/x86/platform/mrst/mrst.c
+++ b/arch/x86/platform/mrst/mrst.c
@@ -46,6 +46,8 @@
 #include <asm/apb_timer.h>
 #include <asm/reboot.h>
 
+extern int noreplace_smp;
+
 /*
  * the clockevent devices on Moorestown/Medfield can be APBT or LAPIC clock,
  * cmdline option x86_mrst_timer can be used to override the configuration
@@ -1097,6 +1099,7 @@ static int __init sfi_parse_devs(struct sfi_table_header 
*table)
 
 static int __init mrst_platform_init(void)
 {
+       noreplace_smp = 1;
        sfi_table_parse(SFI_SIG_GPIO, NULL, NULL, sfi_parse_gpio);
        sfi_table_parse(SFI_SIG_DEVS, NULL, NULL, sfi_parse_devs);
        return 0;
_______________________________________________
MeeGo-kernel mailing list
MeeGo-kernel@lists.meego.com
http://lists.meego.com/listinfo/meego-kernel