[Xen-changelog] Enable NX bit support in 32-bit pae mode.

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1730, 2005/06/22 18:42:58+01:00, kaf24@xxxxxxxxxxxxxxxxxxxx

        Enable NX bit support in 32-bit pae mode.
        Signed-off-by: Gerd Knorr <kraxel@xxxxxxxxxxx>



 page-2level.h |    2 ++
 page-3level.h |    2 ++
 page.h        |    2 --
 3 files changed, 4 insertions(+), 2 deletions(-)


diff -Nru a/xen/include/asm-x86/x86_32/page-2level.h 
b/xen/include/asm-x86/x86_32/page-2level.h
--- a/xen/include/asm-x86/x86_32/page-2level.h  2005-06-22 14:01:52 -04:00
+++ b/xen/include/asm-x86/x86_32/page-2level.h  2005-06-22 14:01:52 -04:00
@@ -46,6 +46,8 @@
  *  12-bit flags = (pte[11:0])
  */
 
+#define _PAGE_NX                0U
+
 /* Extract flags into 12-bit integer, or turn 12-bit flags into a pte mask. */
 #define get_pte_flags(x) ((int)(x) & 0xFFF)
 #define put_pte_flags(x) ((intpte_t)((x) & 0xFFF))
diff -Nru a/xen/include/asm-x86/x86_32/page-3level.h 
b/xen/include/asm-x86/x86_32/page-3level.h
--- a/xen/include/asm-x86/x86_32/page-3level.h  2005-06-22 14:01:52 -04:00
+++ b/xen/include/asm-x86/x86_32/page-3level.h  2005-06-22 14:01:52 -04:00
@@ -59,6 +59,8 @@
  *  32-bit flags = (pte[63:44],pte[11:0])
  */
 
+#define _PAGE_NX (cpu_has_nx ? (1<<31) : 0)
+
 /* Extract flags into 32-bit integer, or turn 32-bit flags into a pte mask. */
 #define get_pte_flags(x) (((int)((x) >> 32) & ~0xFFF) | ((int)(x) & 0xFFF))
 #define put_pte_flags(x) (((intpte_t)((x) & ~0xFFF) << 40) | ((x) & 0xFFF))
diff -Nru a/xen/include/asm-x86/x86_32/page.h 
b/xen/include/asm-x86/x86_32/page.h
--- a/xen/include/asm-x86/x86_32/page.h 2005-06-22 14:01:52 -04:00
+++ b/xen/include/asm-x86/x86_32/page.h 2005-06-22 14:01:52 -04:00
@@ -7,8 +7,6 @@
 #define VADDR_BITS              32
 #define VADDR_MASK              (~0UL)
 
-#define _PAGE_NX                0U
-
 #include <xen/config.h>
 #ifdef CONFIG_X86_PAE
 # include <asm/x86_32/page-3level.h>

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog