The patch titled
64-bit resources: Kconfig change
has been added to the -mm tree. Its filename is
64-bit-resources-kconfig-change.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: 64-bit resources: Kconfig change
From: Vivek Goyal <vgoyal@xxxxxxxxxx>
Based on review comments, removed CONFIG_RESOURCE_32BIT and added
CONFIG_RESOURCE_64BIT in arch independent manner.
Signed-off-by: Roman Zippel <zippel@xxxxxxxxxxxxxx>
Signed-off-by: Vivek Goyal <vgoyal@xxxxxxxxxx>
Cc: Greg KH <greg@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/arm/Kconfig | 7 -------
arch/arm26/Kconfig | 7 -------
arch/cris/Kconfig | 7 -------
arch/frv/Kconfig | 7 -------
arch/i386/Kconfig | 8 +-------
arch/i386/kernel/setup.c | 2 +-
arch/m32r/Kconfig | 7 -------
arch/m68k/Kconfig | 7 -------
arch/m68knommu/Kconfig | 7 -------
arch/mips/Kconfig | 8 --------
arch/parisc/Kconfig | 8 --------
arch/powerpc/Kconfig | 8 --------
arch/ppc/Kconfig | 7 -------
arch/s390/Kconfig | 8 --------
arch/sh/Kconfig | 7 -------
arch/sparc/Kconfig | 7 -------
arch/v850/Kconfig | 7 -------
arch/xtensa/Kconfig | 7 -------
include/linux/types.h | 6 +++---
mm/Kconfig | 6 ++++++
20 files changed, 11 insertions(+), 127 deletions(-)
diff -puN arch/arm26/Kconfig~64-bit-resources-kconfig-change arch/arm26/Kconfig
--- 25/arch/arm26/Kconfig~64-bit-resources-kconfig-change Thu Jun 22 15:19:43 2006
+++ 25-akpm/arch/arm26/Kconfig Thu Jun 22 15:19:43 2006
@@ -187,13 +187,6 @@ config CMDLINE
source "mm/Kconfig"
-config RESOURCES_32BIT
- bool "32 bit Memory and IO resources (EXPERIMENTAL)"
- depends on EXPERIMENTAL
- help
- By default resources are 64 bit. This option allows memory and IO
- resources to be 32 bit to optimize code size.
-
endmenu
source "net/Kconfig"
diff -puN arch/arm/Kconfig~64-bit-resources-kconfig-change arch/arm/Kconfig
--- 25/arch/arm/Kconfig~64-bit-resources-kconfig-change Thu Jun 22 15:19:43 2006
+++ 25-akpm/arch/arm/Kconfig Thu Jun 22 15:19:43 2006
@@ -531,13 +531,6 @@ config NODES_SHIFT
source "mm/Kconfig"
-config RESOURCES_32BIT
- bool "32 bit Memory and IO resources (EXPERIMENTAL)"
- depends on EXPERIMENTAL
- help
- By default resources are 64 bit. This option allows memory and IO
- resources to be 32 bit to optimize code size.
-
config LEDS
bool "Timer and CPU usage LEDs"
depends on ARCH_CDB89712 || ARCH_CO285 || ARCH_EBSA110 || \
diff -puN arch/cris/Kconfig~64-bit-resources-kconfig-change arch/cris/Kconfig
--- 25/arch/cris/Kconfig~64-bit-resources-kconfig-change Thu Jun 22 15:19:43 2006
+++ 25-akpm/arch/cris/Kconfig Thu Jun 22 15:19:43 2006
@@ -80,13 +80,6 @@ config PREEMPT
source mm/Kconfig
-config RESOURCES_32BIT
- bool "32 bit Memory and IO resources (EXPERIMENTAL)"
- depends on EXPERIMENTAL
- help
- By default resources are 64 bit. This option allows memory and IO
- resources to be 32 bit to optimize code size.
-
endmenu
menu "Hardware setup"
diff -puN arch/frv/Kconfig~64-bit-resources-kconfig-change arch/frv/Kconfig
--- 25/arch/frv/Kconfig~64-bit-resources-kconfig-change Thu Jun 22 15:19:43 2006
+++ 25-akpm/arch/frv/Kconfig Thu Jun 22 15:19:43 2006
@@ -80,13 +80,6 @@ config HIGHPTE
source "mm/Kconfig"
-config RESOURCES_32BIT
- bool "32 bit Memory and IO resources (EXPERIMENTAL)"
- depends on EXPERIMENTAL
- help
- By default resources are 64 bit. This option allows memory and IO
- resources to be 32 bit to optimize code size.
-
choice
prompt "uClinux kernel load address"
depends on !MMU
diff -puN arch/i386/Kconfig~64-bit-resources-kconfig-change arch/i386/Kconfig
--- 25/arch/i386/Kconfig~64-bit-resources-kconfig-change Thu Jun 22 15:19:43 2006
+++ 25-akpm/arch/i386/Kconfig Thu Jun 22 15:19:43 2006
@@ -511,6 +511,7 @@ config X86_PAE
bool
depends on HIGHMEM64G
default y
+ select RESOURCES_64BIT
# Common NUMA Features
config NUMA
@@ -754,13 +755,6 @@ config PHYSICAL_START
Don't change this unless you know what you are doing.
-config RESOURCES_32BIT
- bool "32 bit Memory and IO resources (EXPERIMENTAL)"
- depends on EXPERIMENTAL && !X86_PAE
- help
- By default resources are 64 bit. This option allows memory and IO
- resources to be 32 bit to optimize code size.
-
config HOTPLUG_CPU
bool "Support for hot-pluggable CPUs (EXPERIMENTAL)"
depends on SMP && HOTPLUG && EXPERIMENTAL && !X86_VOYAGER
diff -puN arch/i386/kernel/setup.c~64-bit-resources-kconfig-change arch/i386/kernel/setup.c
--- 25/arch/i386/kernel/setup.c~64-bit-resources-kconfig-change Thu Jun 22 15:19:43 2006
+++ 25-akpm/arch/i386/kernel/setup.c Thu Jun 22 15:19:43 2006
@@ -1319,7 +1319,7 @@ legacy_init_iomem_resources(struct resou
probe_roms();
for (i = 0; i < e820.nr_map; i++) {
struct resource *res;
-#ifdef CONFIG_RESOURCES_32BIT
+#ifndef CONFIG_RESOURCES_64BIT
if (e820.map[i].addr + e820.map[i].size > 0x100000000ULL)
continue;
#endif
diff -puN arch/m32r/Kconfig~64-bit-resources-kconfig-change arch/m32r/Kconfig
--- 25/arch/m32r/Kconfig~64-bit-resources-kconfig-change Thu Jun 22 15:19:43 2006
+++ 25-akpm/arch/m32r/Kconfig Thu Jun 22 15:19:43 2006
@@ -188,13 +188,6 @@ config ARCH_DISCONTIGMEM_ENABLE
source "mm/Kconfig"
-config RESOURCES_32BIT
- bool "32 bit Memory and IO resources (EXPERIMENTAL)"
- depends on EXPERIMENTAL
- help
- By default resources are 64 bit. This option allows memory and IO
- resources to be 32 bit to optimize code size.
-
config IRAM_START
hex "Internal memory start address (hex)"
default "00f00000" if !CHIP_M32104
diff -puN arch/m68k/Kconfig~64-bit-resources-kconfig-change arch/m68k/Kconfig
--- 25/arch/m68k/Kconfig~64-bit-resources-kconfig-change Thu Jun 22 15:19:43 2006
+++ 25-akpm/arch/m68k/Kconfig Thu Jun 22 15:19:43 2006
@@ -368,13 +368,6 @@ config 060_WRITETHROUGH
source "mm/Kconfig"
-config RESOURCES_32BIT
- bool "32 bit Memory and IO resources (EXPERIMENTAL)"
- depends on EXPERIMENTAL
- help
- By default resources are 64 bit. This option allows memory and IO
- resources to be 32 bit to optimize code size.
-
endmenu
menu "General setup"
diff -puN arch/m68knommu/Kconfig~64-bit-resources-kconfig-change arch/m68knommu/Kconfig
--- 25/arch/m68knommu/Kconfig~64-bit-resources-kconfig-change Thu Jun 22 15:19:43 2006
+++ 25-akpm/arch/m68knommu/Kconfig Thu Jun 22 15:19:43 2006
@@ -605,13 +605,6 @@ endchoice
source "mm/Kconfig"
-config RESOURCES_32BIT
- bool "32 bit Memory and IO resources (EXPERIMENTAL)"
- depends on EXPERIMENTAL
- help
- By default resources are 64 bit. This option allows memory and IO
- resources to be 32 bit to optimize code size.
-
endmenu
config ISA_DMA_API
diff -puN arch/mips/Kconfig~64-bit-resources-kconfig-change arch/mips/Kconfig
--- 25/arch/mips/Kconfig~64-bit-resources-kconfig-change Thu Jun 22 15:19:43 2006
+++ 25-akpm/arch/mips/Kconfig Thu Jun 22 15:19:43 2006
@@ -1784,14 +1784,6 @@ config HZ
source "kernel/Kconfig.preempt"
-config RESOURCES_32BIT
- bool "32 bit Memory and IO resources (EXPERIMENTAL)"
- depends on EXPERIMENTAL
- depends on 32BIT
- help
- By default resources are 64 bit. This option allows memory and IO
- resources to be 32 bit to optimize code size.
-
config RTC_DS1742
bool "DS1742 BRAM/RTC support"
depends on TOSHIBA_JMR3927 || TOSHIBA_RBTX4927
diff -puN arch/parisc/Kconfig~64-bit-resources-kconfig-change arch/parisc/Kconfig
--- 25/arch/parisc/Kconfig~64-bit-resources-kconfig-change Thu Jun 22 15:19:43 2006
+++ 25-akpm/arch/parisc/Kconfig Thu Jun 22 15:19:43 2006
@@ -217,14 +217,6 @@ source "kernel/Kconfig.preempt"
source "kernel/Kconfig.hz"
source "mm/Kconfig"
-config RESOURCES_32BIT
- bool "32 bit Memory and IO resources (EXPERIMENTAL)"
- depends on EXPERIMENTAL
- depends on !64BIT
- help
- By default resources are 64 bit. This option allows memory and IO
- resources to be 32 bit to optimize code size.
-
config COMPAT
def_bool y
depends on 64BIT
diff -puN arch/powerpc/Kconfig~64-bit-resources-kconfig-change arch/powerpc/Kconfig
--- 25/arch/powerpc/Kconfig~64-bit-resources-kconfig-change Thu Jun 22 15:19:43 2006
+++ 25-akpm/arch/powerpc/Kconfig Thu Jun 22 15:19:43 2006
@@ -645,14 +645,6 @@ config CRASH_DUMP
Don't change this unless you know what you are doing.
-config RESOURCES_32BIT
- bool "32 bit Memory and IO resources (EXPERIMENTAL)"
- depends on EXPERIMENTAL
- depends on PPC32
- help
- By default resources are 64 bit. This option allows memory and IO
- resources to be 32 bit to optimize code size.
-
config EMBEDDEDBOOT
bool
depends on 8xx || 8260
diff -puN arch/ppc/Kconfig~64-bit-resources-kconfig-change arch/ppc/Kconfig
--- 25/arch/ppc/Kconfig~64-bit-resources-kconfig-change Thu Jun 22 15:19:43 2006
+++ 25-akpm/arch/ppc/Kconfig Thu Jun 22 15:19:43 2006
@@ -957,13 +957,6 @@ source kernel/Kconfig.hz
source kernel/Kconfig.preempt
source "mm/Kconfig"
-config RESOURCES_32BIT
- bool "32 bit Memory and IO resources (EXPERIMENTAL)"
- depends on EXPERIMENTAL
- help
- By default resources are 64 bit. This option allows memory and IO
- resources to be 32 bit to optimize code size.
-
source "fs/Kconfig.binfmt"
config PREP_RESIDUAL
diff -puN arch/s390/Kconfig~64-bit-resources-kconfig-change arch/s390/Kconfig
--- 25/arch/s390/Kconfig~64-bit-resources-kconfig-change Thu Jun 22 15:19:43 2006
+++ 25-akpm/arch/s390/Kconfig Thu Jun 22 15:19:43 2006
@@ -218,14 +218,6 @@ config WARN_STACK_SIZE
source "mm/Kconfig"
-config RESOURCES_32BIT
- bool "32 bit Memory and IO resources (EXPERIMENTAL)"
- depends on EXPERIMENTAL
- depends on !64BIT
- help
- By default resources are 64 bit. This option allows memory and IO
- resources to be 32 bit to optimize code size.
-
comment "I/O subsystem configuration"
config MACHCHK_WARNING
diff -puN arch/sh/Kconfig~64-bit-resources-kconfig-change arch/sh/Kconfig
--- 25/arch/sh/Kconfig~64-bit-resources-kconfig-change Thu Jun 22 15:19:43 2006
+++ 25-akpm/arch/sh/Kconfig Thu Jun 22 15:19:43 2006
@@ -532,13 +532,6 @@ config NODES_SHIFT
default "1"
depends on NEED_MULTIPLE_NODES
-config RESOURCES_32BIT
- bool "32 bit Memory and IO resources (EXPERIMENTAL)"
- depends on EXPERIMENTAL
- help
- By default resources are 64 bit. This option allows memory and IO
- resources to be 32 bit to optimize code size.
-
endmenu
menu "Boot options"
diff -puN arch/sparc/Kconfig~64-bit-resources-kconfig-change arch/sparc/Kconfig
--- 25/arch/sparc/Kconfig~64-bit-resources-kconfig-change Thu Jun 22 15:19:43 2006
+++ 25-akpm/arch/sparc/Kconfig Thu Jun 22 15:19:43 2006
@@ -67,13 +67,6 @@ config SPARC32
maintains both the SPARC32 and SPARC64 ports; its web page is
available at <http://www.ultralinux.org/>.
-config RESOURCES_32BIT
- bool "32 bit Memory and IO resources (EXPERIMENTAL)"
- depends on EXPERIMENTAL
- help
- By default resources are 64 bit. This option allows memory and IO
- resources to be 32 bit to optimize code size.
-
# Global things across all Sun machines.
config ISA
bool
diff -puN arch/v850/Kconfig~64-bit-resources-kconfig-change arch/v850/Kconfig
--- 25/arch/v850/Kconfig~64-bit-resources-kconfig-change Thu Jun 22 15:19:43 2006
+++ 25-akpm/arch/v850/Kconfig Thu Jun 22 15:19:43 2006
@@ -235,13 +235,6 @@ menu "Processor type and features"
source "mm/Kconfig"
-config RESOURCES_32BIT
- bool "32 bit Memory and IO resources (EXPERIMENTAL)"
- depends on EXPERIMENTAL
- help
- By default resources are 64 bit. This option allows memory and IO
- resources to be 32 bit to optimize code size.
-
endmenu
diff -puN arch/xtensa/Kconfig~64-bit-resources-kconfig-change arch/xtensa/Kconfig
--- 25/arch/xtensa/Kconfig~64-bit-resources-kconfig-change Thu Jun 22 15:19:43 2006
+++ 25-akpm/arch/xtensa/Kconfig Thu Jun 22 15:19:43 2006
@@ -99,13 +99,6 @@ config MATH_EMULATION
config HIGHMEM
bool "High memory support"
-config RESOURCES_32BIT
- bool "32 bit Memory and IO resources (EXPERIMENTAL)"
- depends on EXPERIMENTAL
- help
- By default resources are 64 bit. This option allows memory and IO
- resources to be 32 bit to optimize code size.
-
endmenu
menu "Platform options"
diff -puN include/linux/types.h~64-bit-resources-kconfig-change include/linux/types.h
--- 25/include/linux/types.h~64-bit-resources-kconfig-change Thu Jun 22 15:19:43 2006
+++ 25-akpm/include/linux/types.h Thu Jun 22 15:19:43 2006
@@ -178,10 +178,10 @@ typedef __u64 __bitwise __be64;
#ifdef __KERNEL__
typedef unsigned __bitwise__ gfp_t;
-#ifdef CONFIG_RESOURCES_32BIT
-typedef __u32 resource_size_t;
+#ifdef CONFIG_RESOURCES_64BIT
+typedef u64 resource_size_t;
#else
-typedef __u64 resource_size_t;
+typedef u32 resource_size_t;
#endif
#endif /* __KERNEL__ */
diff -puN mm/Kconfig~64-bit-resources-kconfig-change mm/Kconfig
--- 25/mm/Kconfig~64-bit-resources-kconfig-change Thu Jun 22 15:19:43 2006
+++ 25-akpm/mm/Kconfig Thu Jun 22 15:21:04 2006
@@ -61,6 +61,12 @@ config SPARSEMEM_MANUAL
endchoice
+config RESOURCES_64BIT
+ bool "64 bit Memory and IO resources (EXPERIMENTAL)" if (!64BIT && EXPERIMENTAL)
+ default 64BIT
+ help
+ This option allows memory and IO resources to be 64 bit.
+
config DISCONTIGMEM
def_bool y
depends on (!SELECT_MEMORY_MODEL && ARCH_DISCONTIGMEM_ENABLE) || DISCONTIGMEM_MANUAL
_
Patches currently in -mm which might be from vgoyal@xxxxxxxxxx are
origin.patch
i2c-801-64bit-resource-fix.patch
64-bit-resources-lose-some-ifdefs.patch
64-bit-resources-kconfig-change.patch
register-hot-added-memory-to-iomem-resource.patch
updated-kdump-documentation.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
