From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Wed, 18 Feb 2009 02:19:25 +0000 (+1100)
Subject: Merge commit 'origin/master' into next
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=82a0a1cc8f94bc59e5919715bc03fc8353fa770d;p=linux-beck.git

Merge commit 'origin/master' into next

Manual merge of:
	arch/powerpc/include/asm/pgtable-ppc32.h
---

82a0a1cc8f94bc59e5919715bc03fc8353fa770d
diff --cc arch/powerpc/include/asm/pgtable-ppc32.h
index 211c90df4763,820b5f0a35ce..98bd7c5fcd0e
--- a/arch/powerpc/include/asm/pgtable-ppc32.h
+++ b/arch/powerpc/include/asm/pgtable-ppc32.h
@@@ -429,11 -429,10 +429,11 @@@ extern int icache_44x_need_flush
  #define PMD_PAGE_SIZE(pmd)	bad_call_to_PMD_PAGE_SIZE()
  #endif
  
 +#define _PAGE_HPTEFLAGS _PAGE_HASHPTE
 +
- #define _PAGE_CHG_MASK	(PAGE_MASK | _PAGE_ACCESSED | _PAGE_DIRTY)
- 
+ #define _PAGE_CHG_MASK	(PAGE_MASK | _PAGE_ACCESSED | _PAGE_DIRTY | \
+ 			 _PAGE_SPECIAL)
  
 -
  #define PAGE_PROT_BITS	(_PAGE_GUARDED | _PAGE_COHERENT | _PAGE_NO_CACHE | \
  			 _PAGE_WRITETHRU | _PAGE_ENDIAN | \
  			 _PAGE_USER | _PAGE_ACCESSED | \