From 398acf8547926f74316f903471738428222dfbd1 Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Tue, 22 Sep 2009 18:12:26 +0000 Subject: [PATCH] --- yaml --- r: 166207 b: refs/heads/master c: f32af63ed1327451cb91e3816fa043b6c2c52db1 h: refs/heads/master i: 166205: dae0db1e39a80a78e502c3acf3c0f8c2dfcbe658 166203: a81afe6f0048e7940dc895a63057d23ee0b8fb99 166199: 351bb6b721cf18afd3d0a6563210cc54867dcb6a 166191: 1b8b872a013893d8c5611b0eaafcf3b5994cee74 166175: e1d953645fd3c7af58c4ab8404c4c488e94e46e0 166143: e264567707b1d299393fe4ea521ce2a6c5d692d1 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/include/asm/pte-40x.h | 1 + trunk/arch/powerpc/include/asm/pte-8xx.h | 1 + trunk/arch/powerpc/include/asm/pte-common.h | 5 ----- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 1634b868268e..f671e722e802 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 142597dbbd8a1d516af3dacfa00037f21612e865 +refs/heads/master: f32af63ed1327451cb91e3816fa043b6c2c52db1 diff --git a/trunk/arch/powerpc/include/asm/pte-40x.h b/trunk/arch/powerpc/include/asm/pte-40x.h index 6c3e1f4378d4..ec0b0b0d1df9 100644 --- a/trunk/arch/powerpc/include/asm/pte-40x.h +++ b/trunk/arch/powerpc/include/asm/pte-40x.h @@ -43,6 +43,7 @@ #define _PAGE_NO_CACHE 0x004 /* I: caching is inhibited */ #define _PAGE_WRITETHRU 0x008 /* W: caching is write-through */ #define _PAGE_USER 0x010 /* matches one of the zone permission bits */ +#define _PAGE_SPECIAL 0x020 /* software: Special page */ #define _PAGE_RW 0x040 /* software: Writes permitted */ #define _PAGE_DIRTY 0x080 /* software: dirty page */ #define _PAGE_HWWRITE 0x100 /* hardware: Dirty & RW, set in exception */ diff --git a/trunk/arch/powerpc/include/asm/pte-8xx.h b/trunk/arch/powerpc/include/asm/pte-8xx.h index 94e979718dcf..dd5ea95fe61e 100644 --- a/trunk/arch/powerpc/include/asm/pte-8xx.h +++ b/trunk/arch/powerpc/include/asm/pte-8xx.h @@ -32,6 +32,7 @@ #define _PAGE_FILE 0x0002 /* when !present: nonlinear file mapping */ #define _PAGE_NO_CACHE 0x0002 /* I: cache inhibit */ #define _PAGE_SHARED 0x0004 /* No ASID (context) compare */ +#define _PAGE_SPECIAL 0x0008 /* SW entry, forced to 0 by the TLB miss */ /* These five software bits must be masked out when the entry is loaded * into the TLB. diff --git a/trunk/arch/powerpc/include/asm/pte-common.h b/trunk/arch/powerpc/include/asm/pte-common.h index c3b65076a263..f2b370180a09 100644 --- a/trunk/arch/powerpc/include/asm/pte-common.h +++ b/trunk/arch/powerpc/include/asm/pte-common.h @@ -25,9 +25,6 @@ #ifndef _PAGE_WRITETHRU #define _PAGE_WRITETHRU 0 #endif -#ifndef _PAGE_SPECIAL -#define _PAGE_SPECIAL 0 -#endif #ifndef _PAGE_4K_PFN #define _PAGE_4K_PFN 0 #endif @@ -179,7 +176,5 @@ extern unsigned long bad_call_to_PMD_PAGE_SIZE(void); #define HAVE_PAGE_AGP /* Advertise support for _PAGE_SPECIAL */ -#ifdef _PAGE_SPECIAL #define __HAVE_ARCH_PTE_SPECIAL -#endif