CONFIG_MIPS_UNCACHED is only selectable of UP kernels. Rebuild

defconfig files.

10 files changed, 12 insertions, 10 deletions

diff --git a/arch/mips/config.in b/arch/mips/config.in
index 0b478fd36..35dd6a40c 100644
--- a/arch/mips/config.in
+++ b/arch/mips/config.in
@@ -426,5 +426,7 @@ if [ "$CONFIG_SERIAL" = "y" ]; then
   bool 'Remote GDB kernel debugging' CONFIG_REMOTE_DEBUG
 fi
 bool 'Magic SysRq key' CONFIG_MAGIC_SYSRQ
-#bool 'Run uncached' CONFIG_MIPS_UNCACHED
+if [ "$CONFIG_SMP" != "y" ]; then
+   bool 'Run uncached' CONFIG_MIPS_UNCACHED
+fi
 endmenu
diff --git a/arch/mips/defconfig b/arch/mips/defconfig
index 1e76c346a..d47c8b52d 100644
--- a/arch/mips/defconfig
+++ b/arch/mips/defconfig
@@ -13,7 +13,6 @@ CONFIG_EXPERIMENTAL=y
 # CONFIG_ACER_PICA_61 is not set
 # CONFIG_ALGOR_P4032 is not set
 # CONFIG_BAGET_MIPS is not set
-# CONFIG_COBALT_MICRO_SERVER is not set
 # CONFIG_DECSTATION is not set
 # CONFIG_DDB5074 is not set
 # CONFIG_DDB5476 is not set
@@ -359,3 +358,4 @@ CONFIG_SGI_DS1286=y
 CONFIG_CROSSCOMPILE=y
 # CONFIG_MIPS_FPE_MODULE is not set
 # CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_MIPS_UNCACHED is not set
diff --git a/arch/mips/defconfig-atlas b/arch/mips/defconfig-atlas
index dbc77735a..518886123 100644
--- a/arch/mips/defconfig-atlas
+++ b/arch/mips/defconfig-atlas
@@ -13,7 +13,6 @@ CONFIG_EXPERIMENTAL=y
 # CONFIG_ACER_PICA_61 is not set
 # CONFIG_ALGOR_P4032 is not set
 # CONFIG_BAGET_MIPS is not set
-# CONFIG_COBALT_MICRO_SERVER is not set
 # CONFIG_DECSTATION is not set
 # CONFIG_DDB5074 is not set
 # CONFIG_DDB5476 is not set
@@ -456,3 +455,4 @@ CONFIG_MSDOS_PARTITION=y
 CONFIG_CROSSCOMPILE=y
 # CONFIG_REMOTE_DEBUG is not set
 # CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_MIPS_UNCACHED is not set
diff --git a/arch/mips/defconfig-ddb5476 b/arch/mips/defconfig-ddb5476
index 07a61bf9d..7a597eb18 100644
--- a/arch/mips/defconfig-ddb5476
+++ b/arch/mips/defconfig-ddb5476
@@ -13,7 +13,6 @@ CONFIG_EXPERIMENTAL=y
 # CONFIG_ACER_PICA_61 is not set
 # CONFIG_ALGOR_P4032 is not set
 # CONFIG_BAGET_MIPS is not set
-# CONFIG_COBALT_MICRO_SERVER is not set
 # CONFIG_DECSTATION is not set
 # CONFIG_DDB5074 is not set
 CONFIG_DDB5476=y
@@ -522,3 +521,4 @@ CONFIG_FONT_8x16=y
 CONFIG_CROSSCOMPILE=y
 # CONFIG_REMOTE_DEBUG is not set
 # CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_MIPS_UNCACHED is not set
diff --git a/arch/mips/defconfig-decstation b/arch/mips/defconfig-decstation
index 91ca2e8cc..0abb60523 100644
--- a/arch/mips/defconfig-decstation
+++ b/arch/mips/defconfig-decstation
@@ -13,7 +13,6 @@ CONFIG_EXPERIMENTAL=y
 # CONFIG_ACER_PICA_61 is not set
 # CONFIG_ALGOR_P4032 is not set
 # CONFIG_BAGET_MIPS is not set
-# CONFIG_COBALT_MICRO_SERVER is not set
 CONFIG_DECSTATION=y
 # CONFIG_DDB5074 is not set
 # CONFIG_DDB5476 is not set
@@ -330,3 +329,4 @@ CONFIG_CROSSCOMPILE=y
 # CONFIG_MIPS_FPE_MODULE is not set
 # CONFIG_REMOTE_DEBUG is not set
 # CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_MIPS_UNCACHED is not set
diff --git a/arch/mips/defconfig-ev96100 b/arch/mips/defconfig-ev96100
index eb7311216..27c26978c 100644
--- a/arch/mips/defconfig-ev96100
+++ b/arch/mips/defconfig-ev96100
@@ -13,7 +13,6 @@ CONFIG_EXPERIMENTAL=y
 # CONFIG_ACER_PICA_61 is not set
 # CONFIG_ALGOR_P4032 is not set
 # CONFIG_BAGET_MIPS is not set
-# CONFIG_COBALT_MICRO_SERVER is not set
 # CONFIG_DECSTATION is not set
 # CONFIG_DDB5074 is not set
 # CONFIG_DDB5476 is not set
@@ -421,3 +420,4 @@ CONFIG_CROSSCOMPILE=y
 # CONFIG_MIPS_FPE_MODULE is not set
 # CONFIG_REMOTE_DEBUG is not set
 # CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_MIPS_UNCACHED is not set
diff --git a/arch/mips/defconfig-ip22 b/arch/mips/defconfig-ip22
index 1e76c346a..d47c8b52d 100644
--- a/arch/mips/defconfig-ip22
+++ b/arch/mips/defconfig-ip22
@@ -13,7 +13,6 @@ CONFIG_EXPERIMENTAL=y
 # CONFIG_ACER_PICA_61 is not set
 # CONFIG_ALGOR_P4032 is not set
 # CONFIG_BAGET_MIPS is not set
-# CONFIG_COBALT_MICRO_SERVER is not set
 # CONFIG_DECSTATION is not set
 # CONFIG_DDB5074 is not set
 # CONFIG_DDB5476 is not set
@@ -359,3 +358,4 @@ CONFIG_SGI_DS1286=y
 CONFIG_CROSSCOMPILE=y
 # CONFIG_MIPS_FPE_MODULE is not set
 # CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_MIPS_UNCACHED is not set
diff --git a/arch/mips/defconfig-malta b/arch/mips/defconfig-malta
index 894b7d54c..0ce1b23cb 100644
--- a/arch/mips/defconfig-malta
+++ b/arch/mips/defconfig-malta
@@ -13,7 +13,6 @@ CONFIG_EXPERIMENTAL=y
 # CONFIG_ACER_PICA_61 is not set
 # CONFIG_ALGOR_P4032 is not set
 # CONFIG_BAGET_MIPS is not set
-# CONFIG_COBALT_MICRO_SERVER is not set
 # CONFIG_DECSTATION is not set
 # CONFIG_DDB5074 is not set
 # CONFIG_DDB5476 is not set
@@ -454,3 +453,4 @@ CONFIG_MSDOS_PARTITION=y
 CONFIG_CROSSCOMPILE=y
 # CONFIG_REMOTE_DEBUG is not set
 # CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_MIPS_UNCACHED is not set
diff --git a/arch/mips/defconfig-orion b/arch/mips/defconfig-orion
index 996616f14..4758af94c 100644
--- a/arch/mips/defconfig-orion
+++ b/arch/mips/defconfig-orion
@@ -13,7 +13,6 @@ CONFIG_EXPERIMENTAL=y
 # CONFIG_ACER_PICA_61 is not set
 # CONFIG_ALGOR_P4032 is not set
 # CONFIG_BAGET_MIPS is not set
-# CONFIG_COBALT_MICRO_SERVER is not set
 # CONFIG_DECSTATION is not set
 # CONFIG_DDB5074 is not set
 # CONFIG_DDB5476 is not set
@@ -308,3 +307,4 @@ CONFIG_MSDOS_PARTITION=y
 CONFIG_CROSSCOMPILE=y
 # CONFIG_MIPS_FPE_MODULE is not set
 # CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_MIPS_UNCACHED is not set
diff --git a/arch/mips/defconfig-rm200 b/arch/mips/defconfig-rm200
index 0b0db6673..38df380d7 100644
--- a/arch/mips/defconfig-rm200
+++ b/arch/mips/defconfig-rm200
@@ -13,7 +13,6 @@ CONFIG_EXPERIMENTAL=y
 # CONFIG_ACER_PICA_61 is not set
 # CONFIG_ALGOR_P4032 is not set
 # CONFIG_BAGET_MIPS is not set
-# CONFIG_COBALT_MICRO_SERVER is not set
 # CONFIG_DECSTATION is not set
 # CONFIG_DDB5074 is not set
 # CONFIG_DDB5476 is not set
@@ -369,3 +368,4 @@ CONFIG_VGA_CONSOLE=y
 CONFIG_CROSSCOMPILE=y
 # CONFIG_MIPS_FPE_MODULE is not set
 # CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_MIPS_UNCACHED is not set