Merge branch 'linus' into x86/pat2

Conflicts:
	arch/x86/mm/init_64.c

diff --cc arch/x86/mm/init_32.c
Simple merge

diff --cc arch/x86/mm/init_64.c
index 8c7eae490a2cb384af9a4d5b239bb0c7274d581f,770536ebf7e95c6360629d1931b910b4fc2a42db..fb30486c82f7f7c21e036feebb9cb58f957d8a36
--- 1/arch/x86/mm/init_64.c
--- 2/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@@ -493,16 -451,16 +493,16 @@@ static void __init find_early_table_spa
        unsigned long puds, pmds, ptes, tables, start;
  
        puds = (end + PUD_SIZE - 1) >> PUD_SHIFT;
-       tables = round_up(puds * sizeof(pud_t), PAGE_SIZE);
+       tables = roundup(puds * sizeof(pud_t), PAGE_SIZE);
 -      if (direct_gbpages) {
 +      if (use_gbpages) {
                unsigned long extra;
                extra = end - ((end>>PUD_SHIFT) << PUD_SHIFT);
                pmds = (extra + PMD_SIZE - 1) >> PMD_SHIFT;
        } else
                pmds = (end + PMD_SIZE - 1) >> PMD_SHIFT;
-       tables += round_up(pmds * sizeof(pmd_t), PAGE_SIZE);
+       tables += roundup(pmds * sizeof(pmd_t), PAGE_SIZE);
  
 -      if (cpu_has_pse) {
 +      if (use_pse) {
                unsigned long extra;
                extra = end - ((end>>PMD_SHIFT) << PMD_SHIFT);
                ptes = (extra + PAGE_SIZE - 1) >> PAGE_SHIFT;

diff --cc arch/x86/mm/ioremap.c
Simple merge

diff --cc arch/x86/mm/pageattr.c
index b6374d653d06d01a5bfe347f8f502aeee95b7e44,898fad617abe3dd25847f0a86348d0c8d1df5150..a9ec89c3fbca32c3fda0e65d8da8846c8f96ed2a
--- 1/arch/x86/mm/pageattr.c
--- 2/arch/x86/mm/pageattr.c
+++ b/arch/x86/mm/pageattr.c
@@@ -979,13 -904,15 +979,15 @@@ EXPORT_SYMBOL(set_memory_nx)
  
  int set_memory_ro(unsigned long addr, int numpages)
  {
 -      return change_page_attr_clear(addr, numpages, __pgprot(_PAGE_RW));
 +      return change_page_attr_clear(&addr, numpages, __pgprot(_PAGE_RW), 0);
  }
+ EXPORT_SYMBOL_GPL(set_memory_ro);
  
  int set_memory_rw(unsigned long addr, int numpages)
  {
 -      return change_page_attr_set(addr, numpages, __pgprot(_PAGE_RW));
 +      return change_page_attr_set(&addr, numpages, __pgprot(_PAGE_RW), 0);
  }
+ EXPORT_SYMBOL_GPL(set_memory_rw);
  
  int set_memory_np(unsigned long addr, int numpages)
  {

diff --cc include/asm-x86/cacheflush.h
Simple merge

diff --cc include/asm-x86/page.h
Simple merge

diff --cc include/asm-x86/pgtable.h
Simple merge