From a7f384e437d21afea9dcf50abddc5b8ef522b2a6 Mon Sep 17 00:00:00 2001 From: Suresh Siddha Date: Wed, 15 Oct 2008 07:46:27 -0700 Subject: [PATCH] --- yaml --- r: 115200 b: refs/heads/master c: f61f1b5717dec9968efd6c8d61bd73b7a61b72a0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/asm-x86/pgtable.h | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0cf2759b1879..46c888384bce 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3a1dfe6eefe483589c99c909202ffe1a20d589b5 +refs/heads/master: f61f1b5717dec9968efd6c8d61bd73b7a61b72a0 diff --git a/trunk/include/asm-x86/pgtable.h b/trunk/include/asm-x86/pgtable.h index ed932453ef26..e9f10af50f49 100644 --- a/trunk/include/asm-x86/pgtable.h +++ b/trunk/include/asm-x86/pgtable.h @@ -138,8 +138,13 @@ #ifdef CONFIG_X86_64 #define __PAGE_KERNEL_IDENT_LARGE_EXEC __PAGE_KERNEL_LARGE_EXEC #else +/* + * For PDE_IDENT_ATTR include USER bit. As the PDE and PTE protection + * bits are combined, this will alow user to access the high address mapped + * VDSO in the presence of CONFIG_COMPAT_VDSO + */ #define PTE_IDENT_ATTR 0x003 /* PRESENT+RW */ -#define PDE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */ +#define PDE_IDENT_ATTR 0x067 /* PRESENT+RW+USER+DIRTY+ACCESSED */ #define PGD_IDENT_ATTR 0x001 /* PRESENT (no other attributes) */ #endif