Merge branch 'x86/urgent' into x86/pat

diff --combined arch/x86/include/asm/io.h
index bdbb4b9616055d9994134227a3f2ccc26f391cc9,1dbbdf4be9b466ba2d77abedbe9e4f364576ec78..bcf7ea4e1367f2478ccc467d80d7c39ce42e66e1
--- 1/arch/x86/include/asm/io.h
--- 2/arch/x86/include/asm/io.h
+++ b/arch/x86/include/asm/io.h
@@@ -91,7 -91,7 +91,7 @@@ extern void unxlate_dev_mem_ptr(unsigne
  
  extern int ioremap_change_attr(unsigned long vaddr, unsigned long size,
                                unsigned long prot_val);
 -extern void __iomem *ioremap_wc(unsigned long offset, unsigned long size);
 +extern void __iomem *ioremap_wc(resource_size_t offset, unsigned long size);
  
  /*
   * early_ioremap() and early_iounmap() are for temporary early boot-time
@@@ -99,7 -99,6 +99,6 @@@
   * A boot-time mapping is currently limited to at most 16 pages.
   */
  extern void early_ioremap_init(void);
- extern void early_ioremap_clear(void);
  extern void early_ioremap_reset(void);
  extern void __iomem *early_ioremap(unsigned long offset, unsigned long size);
  extern void __iomem *early_memremap(unsigned long offset, unsigned long size);

diff --combined arch/x86/mm/ioremap.c
index 2ddb1e79a195eb7c5acaaec1fbb54b2fb48e118f,f45d5e29a72edf4e15616d48c0d174f7905ac417..433f7bd4648af4206fbc4afb0b2fd6b6dab59b6e
--- 1/arch/x86/mm/ioremap.c
--- 2/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c
@@@ -134,25 -134,6 +134,6 @@@ int page_is_ram(unsigned long pagenr
        return 0;
  }
  
- int pagerange_is_ram(unsigned long start, unsigned long end)
- {
-       int ram_page = 0, not_rampage = 0;
-       unsigned long page_nr;
- 
-       for (page_nr = (start >> PAGE_SHIFT); page_nr < (end >> PAGE_SHIFT);
-            ++page_nr) {
-               if (page_is_ram(page_nr))
-                       ram_page = 1;
-               else
-                       not_rampage = 1;
- 
-               if (ram_page == not_rampage)
-                       return -1;
-       }
- 
-       return ram_page;
- }
- 
  /*
   * Fix up the linear direct mapping of the kernel to avoid cache attribute
   * conflicts.
@@@ -367,7 -348,7 +348,7 @@@ EXPORT_SYMBOL(ioremap_nocache)
   *
   * Must be freed with iounmap.
   */
 -void __iomem *ioremap_wc(unsigned long phys_addr, unsigned long size)
 +void __iomem *ioremap_wc(resource_size_t phys_addr, unsigned long size)
  {
        if (pat_enabled)
                return __ioremap_caller(phys_addr, size, _PAGE_CACHE_WC,
@@@ -557,34 -538,9 +538,9 @@@ void __init early_ioremap_init(void
        }
  }
  
- void __init early_ioremap_clear(void)
- {
-       pmd_t *pmd;
- 
-       if (early_ioremap_debug)
-               printk(KERN_INFO "early_ioremap_clear()\n");
- 
-       pmd = early_ioremap_pmd(fix_to_virt(FIX_BTMAP_BEGIN));
-       pmd_clear(pmd);
-       paravirt_release_pte(__pa(bm_pte) >> PAGE_SHIFT);
-       __flush_tlb_all();
- }
- 
  void __init early_ioremap_reset(void)
  {
-       enum fixed_addresses idx;
-       unsigned long addr, phys;
-       pte_t *pte;
- 
        after_paging_init = 1;
-       for (idx = FIX_BTMAP_BEGIN; idx >= FIX_BTMAP_END; idx--) {
-               addr = fix_to_virt(idx);
-               pte = early_ioremap_pte(addr);
-               if (pte_present(*pte)) {
-                       phys = pte_val(*pte) & PAGE_MASK;
-                       set_fixmap(idx, phys);
-               }
-       }
  }
  
  static void __init __early_set_fixmap(enum fixed_addresses idx,