4 files changed, 9 insertions, 4 deletions

diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index 5fa3c671c93..0463f633590 100644
--- a/arch/i386/Kconfig
+++ b/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/arch/i386/kernel/efi.c b/arch/i386/kernel/efi.c
index 9202b67c4b2..8beb0f07d99 100644
--- a/arch/i386/kernel/efi.c
+++ b/arch/i386/kernel/efi.c
@@ -601,8 +601,10 @@ efi_initialize_iomem_resources(struct resource *code_resource,
                 res->end = res->start + ((md->num_pages << EFI_PAGE_SHIFT) - 1);
                 res->flags = IORESOURCE_MEM | IORESOURCE_BUSY;
                 if (request_resource(&iomem_resource, res) < 0)
-                        printk(KERN_ERR PFX "Failed to allocate res %s : 0x%lx-0x%lx\n",
-                                res->name, res->start, res->end);
+                        printk(KERN_ERR PFX "Failed to allocate res %s : "
+                                "0x%llx-0x%llx\n", res->name,
+                                (unsigned long long)res->start,
+                                (unsigned long long)res->end);
                 /*
                  * We don't know which region contains kernel data so we try
                  * it repeatedly and let the resource manager test it.
diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c
index 4a65040cc62..6712f0d2eb3 100644
--- a/arch/i386/kernel/setup.c
+++ b/arch/i386/kernel/setup.c
@@ -1314,8 +1314,10 @@ legacy_init_iomem_resources(struct resource *code_resource, struct resource *dat
         probe_roms();
         for (i = 0; i < e820.nr_map; i++) {
                 struct resource *res;
+#ifndef CONFIG_RESOURCES_64BIT
                 if (e820.map[i].addr + e820.map[i].size > 0x100000000ULL)
                         continue;
+#endif
                 res = kzalloc(sizeof(struct resource), GFP_ATOMIC);
                 switch (e820.map[i].type) {
                 case E820_RAM:  res->name = "System RAM"; break;
diff --git a/arch/i386/pci/i386.c b/arch/i386/pci/i386.c
index a151f7a99f5..10154a2cac6 100644
--- a/arch/i386/pci/i386.c
+++ b/arch/i386/pci/i386.c
@@ -48,10 +48,10 @@
  */
 void
 pcibios_align_resource(void *data, struct resource *res,
-                       unsigned long size, unsigned long align)
+                        resource_size_t size, resource_size_t align)
 {
         if (res->flags & IORESOURCE_IO) {
-                unsigned long start = res->start;
+                resource_size_t start = res->start;
 
                 if (start & 0x300) {
                         start = (start + 0x3ff) & ~0x3ff;