[PATCH] CONFIG_64BIT

This adds CONFIG_64BIT to allow us to disable non-64-bit safe drivers on
64-bit platforms and converts the I2O driver to use it.

diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index bf147bdeb45b1e81ebe8d82067f92fa0f77034a4..da6dd08713b761c815babab8b0693aa5dcad5846 100644 (file)
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -11,6 +11,9 @@ config ALPHA
          now Hewlett-Packard.  The Alpha Linux project has a home page at
          <http://www.alphalinux.org/>.
 
+config 64BIT
+       def_bool y
+
 config MMU
        bool
        default y

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 9e48635abb5fdced35e4fd0347f3add3a061fa09..9d4b08b893d11e5d5f7c87d83958197d4910b158 100644 (file)
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -18,6 +18,9 @@ config IA64
          page at <http://www.linuxia64.org/> and a mailing list at
          linux-ia64@linuxia64.org.
 
+config 64BIT
+       def_bool y
+
 config MMU
        bool
        default y

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 84c57063e08c5d4fd1d8b3a861d82b243408a340..4e2411ecb63de4147c475137bca69d5cc8ba5c41 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -11,6 +11,9 @@ config MIPS64
          64-bit processing, otherwise say N.  You must say Y for kernels for
          SGI IP27 (Origin 200 and 2000).  If in doubt say N.
 
+config 64BIT
+       def_bool MIPS64
+
 config MIPS32
        bool
        depends on MIPS64 = 'n'

diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index 6142becdc73abaf4f21d36d6f0f500c8457d10e2..461a9d9f9f58c319a8b9b4845fb676024d39f803 100644 (file)
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -103,6 +103,9 @@ config PARISC64
          enable this option otherwise. The 64bit kernel is significantly bigger
          and slower than the 32bit one.
 
+config 64BIT
+       def_bool PARISC64
+
 config PDC_NARROW
        bool "32-bit firmware"
        depends on PARISC64

diff --git a/arch/ppc64/Kconfig b/arch/ppc64/Kconfig
index c983a5051bb05716b29f81ecbe4df5bdc1ad8b09..1405bf41ed014907ecb7689470811a723abf216a 100644 (file)
--- a/arch/ppc64/Kconfig
+++ b/arch/ppc64/Kconfig
@@ -3,6 +3,9 @@
 # see Documentation/kbuild/kconfig-language.txt.
 #
 
+config 64BIT
+       def_bool y
+
 config MMU
        bool
        default y

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index bd1369d1f635924173e90e0771403420697fdead..bda2bee57f994f206c75e4118e7ffe1962ce7755 100644 (file)
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -40,6 +40,9 @@ config ARCH_S390X
          Select this option if you have a 64 bit IBM zSeries machine
          and want to use the 64 bit addressing mode.
 
+config 64BIT
+       def_bool ARCH_S390X
+
 config ARCH_S390_31
        bool
        depends on ARCH_S390X = 'n'

diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index ee6c1ce5a97283c8a447b21beec88a2c00926daf..c04c3e855238a731d2f005da9c2b1b477b5028b4 100644 (file)
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -5,6 +5,9 @@
 
 mainmenu "Linux/UltraSPARC Kernel Configuration"
 
+config 64BIT
+       def_bool y
+
 config MMU
        bool
        default y

diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index 0bafd4c4e3e8bc174e26963cab7755d6178ab503..a719570b81df71cd43a4051cc96fe7afa2fc1043 100644 (file)
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -16,6 +16,9 @@ config X86_64
          Port to the x86-64 architecture. x86-64 is a 64-bit extension to the
          classical 32-bit x86 architecture. For details see http://www.x86-64.org
 
+config 64BIT
+       def_bool y
+
 config X86
        bool
        default y

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index b3c9048c3a1755cdcdc5a9f11530a2cafff4172b..65add96b3975c5303d60b62c276280b034c7227a 100644 (file)
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -366,7 +366,7 @@ source "drivers/scsi/aic7xxx/Kconfig.aic79xx"
 # All the I2O code and drivers do not seem to be 64bit safe.
 config SCSI_DPT_I2O
        tristate "Adaptec I2O RAID support "
-       depends on !X86_64 && SCSI && BROKEN
+       depends on !64BIT && SCSI && BROKEN
        help
          This driver supports all of Adaptec's I2O based RAID controllers as 
          well as the DPT SmartRaid V cards.  This is an Adaptec maintained