Pull context-bitmap into release branch

diff --combined arch/ia64/kernel/setup.c
index 3af6de3,c9388a9..5add0bc
--- 1/arch/ia64/kernel/setup.c
--- 2/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@@ -92,13 -92,6 +92,13 @@@ extern void efi_initialize_iomem_resour
  extern char _text[], _end[], _etext[];
  
  unsigned long ia64_max_cacheline_size;
 +
 +int dma_get_cache_alignment(void)
 +{
 +        return ia64_max_cacheline_size;
 +}
 +EXPORT_SYMBOL(dma_get_cache_alignment);
 +
  unsigned long ia64_iobase;    /* virtual address for I/O accesses */
  EXPORT_SYMBOL(ia64_iobase);
  struct io_space io_space[MAX_IO_SPACES];
@@@ -461,6 -454,7 +461,7 @@@ setup_arch (char **cmdline_p
  #endif
  
        cpu_init();     /* initialize the bootstrap CPU */
+       mmu_context_init();     /* initialize context_id bitmap */
  
  #ifdef CONFIG_ACPI
        acpi_boot_init();