From d9d6470ea1bec998ce2e324b558bc092fdd15fba Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Mon, 12 Jun 2006 17:11:31 -0700
Subject: [PATCH] --- yaml --- r: 31101 b: refs/heads/master c:
 6550e07f41ce8473ed684dac54fbfbd42183ffda h: refs/heads/master i:   31099:
 6d21f14fc07a4f8ad8cff65c26960ae4cb3e403d v: v3

---
 [refs]                      | 2 +-
 trunk/arch/i386/Kconfig     | 1 +
 trunk/include/linux/types.h | 7 ++++++-
 trunk/kernel/resource.c     | 8 +++-----
 trunk/mm/Kconfig            | 6 ++++++
 5 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 3df9024828ff..edfce7736ea1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2427ddd8fae2febe3f5ac1ba76b092541304d9f0
+refs/heads/master: 6550e07f41ce8473ed684dac54fbfbd42183ffda
diff --git a/trunk/arch/i386/Kconfig b/trunk/arch/i386/Kconfig
index 47c08bcd9b24..7e46ad7a7b69 100644
--- a/trunk/arch/i386/Kconfig
+++ b/trunk/arch/i386/Kconfig
@@ -529,6 +529,7 @@ config X86_PAE
 	bool
 	depends on HIGHMEM64G
 	default y
+	select RESOURCES_64BIT
 
 # Common NUMA Features
 config NUMA
diff --git a/trunk/include/linux/types.h b/trunk/include/linux/types.h
index a021e1577336..3f235660a3cd 100644
--- a/trunk/include/linux/types.h
+++ b/trunk/include/linux/types.h
@@ -178,9 +178,14 @@ typedef __u64 __bitwise __be64;
 #ifdef __KERNEL__
 typedef unsigned __bitwise__ gfp_t;
 
-typedef unsigned long resource_size_t;
+#ifdef CONFIG_RESOURCES_64BIT
+typedef u64 resource_size_t;
+#else
+typedef u32 resource_size_t;
 #endif
 
+#endif	/* __KERNEL__ */
+
 struct ustat {
 	__kernel_daddr_t	f_tfree;
 	__kernel_ino_t		f_tinode;
diff --git a/trunk/kernel/resource.c b/trunk/kernel/resource.c
index 54835c02ab37..cc73029088a7 100644
--- a/trunk/kernel/resource.c
+++ b/trunk/kernel/resource.c
@@ -23,20 +23,18 @@
 
 struct resource ioport_resource = {
 	.name	= "PCI IO",
-	.start	= 0x0000,
+	.start	= 0,
 	.end	= IO_SPACE_LIMIT,
 	.flags	= IORESOURCE_IO,
 };
-
 EXPORT_SYMBOL(ioport_resource);
 
 struct resource iomem_resource = {
 	.name	= "PCI mem",
-	.start	= 0UL,
-	.end	= ~0UL,
+	.start	= 0,
+	.end	= -1,
 	.flags	= IORESOURCE_MEM,
 };
-
 EXPORT_SYMBOL(iomem_resource);
 
 static DEFINE_RWLOCK(resource_lock);
diff --git a/trunk/mm/Kconfig b/trunk/mm/Kconfig
index 66e65ab39426..e3644b0062b1 100644
--- a/trunk/mm/Kconfig
+++ b/trunk/mm/Kconfig
@@ -145,3 +145,9 @@ config MIGRATION
 	  while the virtual addresses are not changed. This is useful for
 	  example on NUMA systems to put pages nearer to the processors accessing
 	  the page.
+
+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.