Pull new-efi-memmap into release branch

diff --combined arch/ia64/kernel/setup.c
index e256b114bf4e79b9b43dc24a77f9f20f9cae02da,3e9b797e6588764bd6a07479607ae26ac4cef0c9..f95fd276663458865744f7034bb4d23419223ba9
--- 1/arch/ia64/kernel/setup.c
--- 2/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@@ -78,6 -78,19 +78,19 @@@ struct screen_info screen_info
  unsigned long vga_console_iobase;
  unsigned long vga_console_membase;
  
+ static struct resource data_resource = {
+       .name   = "Kernel data",
+       .flags  = IORESOURCE_BUSY | IORESOURCE_MEM
+ };
+ 
+ static struct resource code_resource = {
+       .name   = "Kernel code",
+       .flags  = IORESOURCE_BUSY | IORESOURCE_MEM
+ };
+ extern void efi_initialize_iomem_resources(struct resource *,
+               struct resource *);
+ extern char _text[], _end[], _etext[];
+ 
  unsigned long ia64_max_cacheline_size;
  unsigned long ia64_iobase;    /* virtual address for I/O accesses */
  EXPORT_SYMBOL(ia64_iobase);
@@@ -171,6 -184,22 +184,22 @@@ sort_regions (struct rsvd_region *rsvd_
        }
  }
  
+ /*
+  * Request address space for all standard resources
+  */
+ static int __init register_memory(void)
+ {
+       code_resource.start = ia64_tpa(_text);
+       code_resource.end   = ia64_tpa(_etext) - 1;
+       data_resource.start = ia64_tpa(_etext);
+       data_resource.end   = ia64_tpa(_end) - 1;
+       efi_initialize_iomem_resources(&code_resource, &data_resource);
+ 
+       return 0;
+ }
+ 
+ __initcall(register_memory);
+ 
  /**
   * reserve_memory - setup reserved memory areas
   *
@@@ -211,6 -240,9 +240,9 @@@ reserve_memory (void
        }
  #endif
  
+       efi_memmap_init(&rsvd_region[n].start, &rsvd_region[n].end);
+       n++;
+ 
        /* end of memory marker */
        rsvd_region[n].start = ~0UL;
        rsvd_region[n].end   = ~0UL;
@@@ -244,31 -276,28 +276,31 @@@ find_initrd (void
  static void __init
  io_port_init (void)
  {
 -      extern unsigned long ia64_iobase;
        unsigned long phys_iobase;
  
        /*
 -       *  Set `iobase' to the appropriate address in region 6 (uncached access range).
 +       * Set `iobase' based on the EFI memory map or, failing that, the
 +       * value firmware left in ar.k0.
         *
 -       *  The EFI memory map is the "preferred" location to get the I/O port space base,
 -       *  rather the relying on AR.KR0. This should become more clear in future SAL
 -       *  specs. We'll fall back to getting it out of AR.KR0 if no appropriate entry is
 -       *  found in the memory map.
 +       * Note that in ia32 mode, IN/OUT instructions use ar.k0 to compute
 +       * the port's virtual address, so ia32_load_state() loads it with a
 +       * user virtual address.  But in ia64 mode, glibc uses the
 +       * *physical* address in ar.k0 to mmap the appropriate area from
 +       * /dev/mem, and the inX()/outX() interfaces use MMIO.  In both
 +       * cases, user-mode can only use the legacy 0-64K I/O port space.
 +       *
 +       * ar.k0 is not involved in kernel I/O port accesses, which can use
 +       * any of the I/O port spaces and are done via MMIO using the
 +       * virtual mmio_base from the appropriate io_space[].
         */
        phys_iobase = efi_get_iobase();
 -      if (phys_iobase)
 -              /* set AR.KR0 since this is all we use it for anyway */
 -              ia64_set_kr(IA64_KR_IO_BASE, phys_iobase);
 -      else {
 +      if (!phys_iobase) {
                phys_iobase = ia64_get_kr(IA64_KR_IO_BASE);
 -              printk(KERN_INFO "No I/O port range found in EFI memory map, falling back "
 -                     "to AR.KR0\n");
 -              printk(KERN_INFO "I/O port base = 0x%lx\n", phys_iobase);
 +              printk(KERN_INFO "No I/O port range found in EFI memory map, "
 +                      "falling back to AR.KR0 (0x%lx)\n", phys_iobase);
        }
        ia64_iobase = (unsigned long) ioremap(phys_iobase, 0);
 +      ia64_set_kr(IA64_KR_IO_BASE, __pa(ia64_iobase));
  
        /* setup legacy IO port space */
        io_space[0].mmio_base = ia64_iobase;
@@@ -387,7 -416,7 +419,7 @@@ setup_arch (char **cmdline_p
        if (early_console_setup(*cmdline_p) == 0)
                mark_bsp_online();
  
 -#ifdef CONFIG_ACPI_BOOT
 +#ifdef CONFIG_ACPI
        /* Initialize the ACPI boot-time table parser */
        acpi_table_init();
  # ifdef CONFIG_ACPI_NUMA
@@@ -423,7 -452,7 +455,7 @@@
  
        cpu_init();     /* initialize the bootstrap CPU */
  
 -#ifdef CONFIG_ACPI_BOOT
 +#ifdef CONFIG_ACPI
        acpi_boot_init();
  #endif