How's this look? I picked MMU=x implies SWAP=x for defaults, just
because that's how they were before...
===== arch/alpha/Kconfig 1.10 vs edited =====
--- 1.10/arch/alpha/Kconfig Tue Feb 18 16:57:50 2003
+++ edited/arch/alpha/Kconfig Thu Mar 6 11:36:47 2003
@@ -15,10 +15,6 @@
bool
default y
-config SWAP
- bool
- default y
-
config UID16
bool
===== arch/arm/Kconfig 1.9 vs edited =====
--- 1.9/arch/arm/Kconfig Sat Feb 15 02:34:08 2003
+++ edited/arch/arm/Kconfig Thu Mar 6 11:36:56 2003
@@ -20,10 +20,6 @@
bool
default y
-config SWAP
- bool
- default y
-
config EISA
bool
---help---
===== arch/cris/Kconfig 1.5 vs edited =====
--- 1.5/arch/cris/Kconfig Sun Feb 9 18:29:49 2003
+++ edited/arch/cris/Kconfig Thu Mar 6 11:37:00 2003
@@ -9,10 +9,6 @@
bool
default y
-config SWAP
- bool
- default y
-
config UID16
bool
default y
===== arch/i386/Kconfig 1.46 vs edited =====
--- 1.46/arch/i386/Kconfig Sun Mar 2 19:14:31 2003
+++ edited/arch/i386/Kconfig Thu Mar 6 11:36:15 2003
@@ -18,15 +18,6 @@
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
===== arch/ia64/Kconfig 1.14 vs edited =====
--- 1.14/arch/ia64/Kconfig Sun Feb 9 18:29:49 2003
+++ edited/arch/ia64/Kconfig Thu Mar 6 11:37:08 2003
@@ -22,10 +22,6 @@
bool
default y
-config SWAP
- bool
- default y
-
config RWSEM_GENERIC_SPINLOCK
bool
default y
===== arch/m68k/Kconfig 1.9 vs edited =====
--- 1.9/arch/m68k/Kconfig Sun Feb 9 18:29:49 2003
+++ edited/arch/m68k/Kconfig Thu Mar 6 11:37:11 2003
@@ -10,10 +10,6 @@
bool
default y
-config SWAP
- bool
- default y
-
config UID16
bool
default y
===== arch/m68knommu/Kconfig 1.6 vs edited =====
--- 1.6/arch/m68knommu/Kconfig Tue Feb 18 03:27:38 2003
+++ edited/arch/m68knommu/Kconfig Thu Mar 6 11:37:25 2003
@@ -9,10 +9,6 @@
bool
default n
-config SWAP
- bool
- default n
-
config FPU
bool
default n
===== arch/mips/Kconfig 1.8 vs edited =====
--- 1.8/arch/mips/Kconfig Sun Feb 9 18:29:49 2003
+++ edited/arch/mips/Kconfig Thu Mar 6 11:37:29 2003
@@ -10,10 +10,6 @@
bool
default y
-config SWAP
- bool
- default y
-
config SMP
bool
---help---
===== arch/mips64/Kconfig 1.9 vs edited =====
--- 1.9/arch/mips64/Kconfig Sun Feb 9 18:29:49 2003
+++ edited/arch/mips64/Kconfig Thu Mar 6 11:37:33 2003
@@ -9,10 +9,6 @@
bool
default y
-config SWAP
- bool
- default y
-
source "init/Kconfig"
===== arch/parisc/Kconfig 1.10 vs edited =====
--- 1.10/arch/parisc/Kconfig Sun Feb 9 18:29:49 2003
+++ edited/arch/parisc/Kconfig Thu Mar 6 11:37:35 2003
@@ -18,10 +18,6 @@
bool
default y
-config SWAP
- bool
- default y
-
config STACK_GROWSUP
bool
default y
===== arch/ppc/Kconfig 1.17 vs edited =====
--- 1.17/arch/ppc/Kconfig Sun Feb 9 18:29:49 2003
+++ edited/arch/ppc/Kconfig Thu Mar 6 11:37:47 2003
@@ -1126,22 +1126,6 @@
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"
===== arch/ppc64/Kconfig 1.13 vs edited =====
--- 1.13/arch/ppc64/Kconfig Thu Feb 13 01:47:26 2003
+++ edited/arch/ppc64/Kconfig Thu Mar 6 11:37:50 2003
@@ -7,10 +7,6 @@
bool
default y
-config SWAP
- bool
- default y
-
config UID16
bool
===== arch/s390/Kconfig 1.7 vs edited =====
--- 1.7/arch/s390/Kconfig Mon Feb 24 11:24:34 2003
+++ edited/arch/s390/Kconfig Thu Mar 6 11:37:54 2003
@@ -7,10 +7,6 @@
bool
default y
-config SWAP
- bool
- default y
-
config UID16
bool
default y
===== arch/s390x/Kconfig 1.8 vs edited =====
--- 1.8/arch/s390x/Kconfig Mon Feb 24 11:24:34 2003
+++ edited/arch/s390x/Kconfig Thu Mar 6 11:37:59 2003
@@ -7,10 +7,6 @@
bool
default y
-config SWAP
- bool
- default y
-
config RWSEM_GENERIC_SPINLOCK
bool
===== arch/sh/Kconfig 1.7 vs edited =====
--- 1.7/arch/sh/Kconfig Sun Feb 9 18:29:49 2003
+++ edited/arch/sh/Kconfig Thu Mar 6 11:38:02 2003
@@ -18,10 +18,6 @@
bool
default y
-config SWAP
- bool
- default y
-
config UID16
bool
default y
===== arch/sparc/Kconfig 1.10 vs edited =====
--- 1.10/arch/sparc/Kconfig Mon Mar 3 01:33:45 2003
+++ edited/arch/sparc/Kconfig Thu Mar 6 11:38:04 2003
@@ -9,10 +9,6 @@
bool
default y
-config SWAP
- bool
- default y
-
config UID16
bool
default y
===== arch/sparc64/Kconfig 1.15 vs edited =====
--- 1.15/arch/sparc64/Kconfig Wed Mar 5 09:22:15 2003
+++ edited/arch/sparc64/Kconfig Thu Mar 6 11:38:06 2003
@@ -9,10 +9,6 @@
bool
default y
-config SWAP
- bool
- default y
-
source "init/Kconfig"
===== arch/um/Kconfig 1.8 vs edited =====
--- 1.8/arch/um/Kconfig Wed Feb 5 21:16:01 2003
+++ edited/arch/um/Kconfig Thu Mar 6 11:38:09 2003
@@ -7,10 +7,6 @@
bool
default y
-config SWAP
- bool
- default y
-
mainmenu "Linux/Usermode Kernel Configuration"
config ISA
===== arch/v850/Kconfig 1.7 vs edited =====
--- 1.7/arch/v850/Kconfig Tue Feb 18 19:40:02 2003
+++ edited/arch/v850/Kconfig Thu Mar 6 11:38:13 2003
@@ -10,9 +10,6 @@
config MMU
bool
default n
-config SWAP
- bool
- default n
config UID16
bool
default n
===== arch/x86_64/Kconfig 1.15 vs edited =====
--- 1.15/arch/x86_64/Kconfig Wed Feb 12 06:38:20 2003
+++ edited/arch/x86_64/Kconfig Thu Mar 6 11:38:19 2003
@@ -24,10 +24,6 @@
bool
default y
-config SWAP
- bool
- default y
-
config ISA
bool
===== init/Kconfig 1.10 vs edited =====
--- 1.10/init/Kconfig Mon Feb 3 13:19:37 2003
+++ edited/init/Kconfig Thu Mar 6 11:41:51 2003
@@ -37,6 +37,16 @@
menu "General setup"
+config SWAP
+ bool "Support for paging of anonymous memory"
+ default y if MMU
+ default n if !MMU
+ 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---
-- Tom Rini http://gate.crashing.org/~trini/ - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/