summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Lutomirski2014-03-14 00:01:27 +0100
committerH. Peter Anvin2014-03-14 00:20:17 +0100
commit7dda038756704b3562187b29c81f86de935148c6 (patch)
tree5a1ee340abe41a7be93d38dbf2da3e0f6f25ba58
parentx86, vdso: Remove compat vdso support (diff)
downloadkernel-qcow2-linux-7dda038756704b3562187b29c81f86de935148c6.tar.gz
kernel-qcow2-linux-7dda038756704b3562187b29c81f86de935148c6.tar.xz
kernel-qcow2-linux-7dda038756704b3562187b29c81f86de935148c6.zip
x86_32, mm: Remove user bit from identity map PDE
The only reason that the user bit was set was to support userspace access to the compat vDSO in the fixmap. The compat vDSO is gone, so the user bit can be removed. Signed-off-by: Andy Lutomirski <luto@amacapital.net> Link: http://lkml.kernel.org/r/e240a977f3c7cbd525a091fd6521499ec4b8e94f.1394751608.git.luto@amacapital.net Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
-rw-r--r--arch/x86/include/asm/pgtable_types.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h
index 1aa9ccd43223..757f9c40321b 100644
--- a/arch/x86/include/asm/pgtable_types.h
+++ b/arch/x86/include/asm/pgtable_types.h
@@ -214,13 +214,8 @@
#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 0x067 /* PRESENT+RW+USER+DIRTY+ACCESSED */
+#define PDE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
#define PGD_IDENT_ATTR 0x001 /* PRESENT (no other attributes) */
#endif