[PATCH] move CONFIG_SWAP around

Patch from Tom Rini <trini@kernel.crashing.org>

Take CONFIG_SWAP out of the top-level menu into the general setup menu.  Make
it dependent on CONFIG_MMU and common to all architectures.

21 files changed, 10 insertions, 96 deletions

diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 5e23674cf052..95717d5a1610 100644
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -15,10 +15,6 @@ config MMU
 	bool
 	default y
 
-config SWAP
-	bool
-	default y
-
 config UID16
 	bool
 
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index d7fa9af1ddfd..f70f428ce026 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -20,10 +20,6 @@ config MMU
 	bool
 	default y
 
-config SWAP
-	bool
-	default y
-
 config EISA
 	bool
 	---help---
diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index 659902acbb59..3030e659bbaf 100644
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -9,10 +9,6 @@ config MMU
 	bool
 	default y
 
-config SWAP
-	bool
-	default y
-
 config UID16
 	bool
 	default y
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index 02f99c30f6bb..d2ed950698d1 100644
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -18,15 +18,6 @@ config MMU
 	bool
 	default y
 
-config SWAP
-	bool "Support for paging of anonymous memory"
-	default y
-	help
-	  This option allows you to choose whether you want to have support
-	  for socalled swap devices or swap files in your kernel that are
-	  used to provide more virtual memory than the actual RAM present
-	  in your computer.  If unusre say Y.
-
 config SBUS
 	bool
 
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index b39d520fd0e9..dc583c9b2606 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -22,10 +22,6 @@ config MMU
 	bool
 	default y
 
-config SWAP
-	bool
-	default y
-
 config RWSEM_XCHGADD_ALGORITHM
 	bool
 	default y
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index f5c3c1fdc5ae..5e8eb3ab540e 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -10,10 +10,6 @@ config MMU
 	bool
 	default y
 
-config SWAP
-	bool
-	default y
-
 config UID16
 	bool
 	default y
diff --git a/arch/m68knommu/Kconfig b/arch/m68knommu/Kconfig
index d02108dfa5e8..b40bf97f5034 100644
--- a/arch/m68knommu/Kconfig
+++ b/arch/m68knommu/Kconfig
@@ -9,10 +9,6 @@ config MMU
 	bool
 	default n
 
-config SWAP
-	bool
-	default n
-
 config FPU
 	bool
 	default n
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 1be3f6ffffd4..38412096bb51 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -10,10 +10,6 @@ config MMU
 	bool
 	default y
 
-config SWAP
-	bool
-	default y
-
 config SMP
 	bool
 	---help---
diff --git a/arch/mips64/Kconfig b/arch/mips64/Kconfig
index 7404b75daf94..8caca1376dd9 100644
--- a/arch/mips64/Kconfig
+++ b/arch/mips64/Kconfig
@@ -9,10 +9,6 @@ config MMU
 	bool
 	default y
 
-config SWAP
-	bool
-	default y
-
 source "init/Kconfig"
 
 
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index fa10bf385dd1..768ccd4c906b 100644
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -18,10 +18,6 @@ config MMU
 	bool
 	default y
 
-config SWAP
-	bool
-	default y
-
 config STACK_GROWSUP
 	bool
 	default y
diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig
index de40d9fd0c45..84e94b319e68 100644
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig
@@ -1126,22 +1126,6 @@ config BOOT_LOAD
 config PIN_TLB
 	bool "Pinned Kernel TLBs (860 ONLY)"
 	depends on ADVANCED_OPTIONS && 8xx
-
-config SWAP
-	bool "Enable support for swap"
-	depends on ADVANCED_OPTIONS
-	help
-	  This option allows you to turn off support for swapfiles in
-	  the kernel.  This can be useful if you know that your system
-	  will never have swap.
-
-	  Say Y here unless you know what you are doing.
-
-config SWAP
-	bool
-	depends on !ADVANCED_OPTIONS
-	default y
-
 endmenu
 
 source "drivers/mtd/Kconfig"
diff --git a/arch/ppc64/Kconfig b/arch/ppc64/Kconfig
index 0c1c535482b3..e91a4545eb4c 100644
--- a/arch/ppc64/Kconfig
+++ b/arch/ppc64/Kconfig
@@ -7,10 +7,6 @@ config MMU
 	bool
 	default y
 
-config SWAP
-	bool
-	default y
-
 config UID16
 	bool
 
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 8e4ff0a17bb0..d9b81808085c 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -7,10 +7,6 @@ config MMU
 	bool
 	default y
 
-config SWAP
-	bool
-	default y
-
 config UID16
 	bool
 	default y
diff --git a/arch/s390x/Kconfig b/arch/s390x/Kconfig
index 9a38be53f3c6..f307b24dd933 100644
--- a/arch/s390x/Kconfig
+++ b/arch/s390x/Kconfig
@@ -7,10 +7,6 @@ config MMU
 	bool
 	default y
 
-config SWAP
-	bool
-	default y
-
 config RWSEM_GENERIC_SPINLOCK
 	bool
 
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index cb3117073949..0b3865220866 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -18,10 +18,6 @@ config MMU
 	bool
 	default y
 
-config SWAP
-	bool
-	default y
-
 config UID16
 	bool
 	default y
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 93efa0d81793..dc9ee0323325 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -9,10 +9,6 @@ config MMU
 	bool
 	default y
 
-config SWAP
-	bool
-	default y
-
 config UID16
 	bool
 	default y
diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index 2168aeed17ff..5f7df912e377 100644
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -9,10 +9,6 @@ config MMU
 	bool
 	default y
 
-config SWAP
-	bool
-	default y
-
 source "init/Kconfig"
 
 
diff --git a/arch/um/Kconfig b/arch/um/Kconfig
index b95f163c71ba..6c81b99be278 100644
--- a/arch/um/Kconfig
+++ b/arch/um/Kconfig
@@ -7,10 +7,6 @@ config MMU
 	bool
 	default y
 
-config SWAP
-	bool
-	default y
-
 mainmenu "Linux/Usermode Kernel Configuration"
 
 config ISA
diff --git a/arch/v850/Kconfig b/arch/v850/Kconfig
index 312d5f93b35d..82a3cc70d3d8 100644
--- a/arch/v850/Kconfig
+++ b/arch/v850/Kconfig
@@ -10,9 +10,6 @@ mainmenu "uClinux/v850 (w/o MMU) Kernel Configuration"
 config MMU
        	bool
 	default n
-config SWAP
-	bool
-	default n
 config UID16
 	bool
 	default n
diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index 7b79348165ac..68402665d277 100644
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -24,10 +24,6 @@ config MMU
 	bool
 	default y
 
-config SWAP
-	bool
-	default y
-
 config ISA
 	bool
 
diff --git a/init/Kconfig b/init/Kconfig
index 887abc316ee2..7dec6b722483 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -37,6 +37,16 @@ endmenu
 
 menu "General setup"
 
+config SWAP
+	bool "Support for paging of anonymous memory"
+	depends on MMU
+	default y
+	help
+	  This option allows you to choose whether you want to have support
+	  for socalled swap devices or swap files in your kernel that are
+	  used to provide more virtual memory than the actual RAM present
+	  in your computer.  If unusre say Y.
+
 config SYSVIPC
 	bool "System V IPC"
 	---help---