From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 10 Oct 2008 17:30:08 +0000 (+0200)
Subject: Merge branch 'linus' into x86/pat2
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=3dd392a407d15250a501fa109cc1f93fee95ef85;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'linus' into x86/pat2

Conflicts:
	arch/x86/mm/init_64.c
---

3dd392a407d15250a501fa109cc1f93fee95ef85
diff --cc arch/x86/mm/init_64.c
index 8c7eae490a2c,770536ebf7e9..fb30486c82f7
--- a/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/pageattr.c
index b6374d653d06,898fad617abe..a9ec89c3fbca
--- a/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)
  {