Merge branch 'x86/cleanups' into x86/core

diff --combined arch/x86/include/asm/io.h
index bcf7ea4e1367f2478ccc467d80d7c39ce42e66e1,76797f4783bbcd4cab779921055769ee2b9a8a5d..f710ec2370e71f7b4b4ceba1fa1fc11834c9123b
--- 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
@@@ -105,5 -105,6 +105,6 @@@ extern void __iomem *early_memremap(uns
  extern void early_iounmap(void __iomem *addr, unsigned long size);
  extern void __iomem *fix_ioremap(unsigned idx, unsigned long phys);
  
+ #define IO_SPACE_LIMIT 0xffff
  
  #endif /* _ASM_X86_IO_H */