From ce99076635d342a1f6ae1c3b781638c04372df3d Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Mon, 28 Jan 2013 01:59:14 +0100
Subject: Add initial code for disabling ring1 xen execution

* xen/configfrag.ac (--disable-ring1): Add option.
* i386/xen/xen_boothdr.S (XEN_ELFNOTE_FEATURES) [!MACH_RING1]: Add
supervisor_mode_kernel.
* i386/i386/seg.h (KERNEL_RING) [!MACH_RING1]: Set macro to 0.
---
 i386/xen/xen_boothdr.S | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'i386/xen/xen_boothdr.S')

diff --git a/i386/xen/xen_boothdr.S b/i386/xen/xen_boothdr.S
index 4e2fb51..617be51 100644
--- a/i386/xen/xen_boothdr.S
+++ b/i386/xen/xen_boothdr.S
@@ -38,6 +38,9 @@
 #endif
 #ifndef	MACH_PV_DESCRIPTORS
 	.ascii	"|writable_descriptor_tables"
+#endif	/* MACH_PV_DESCRIPTORS */
+#ifndef	MACH_RING1
+	.ascii	"|supervisor_mode_kernel"
 #endif	/* MACH_PV_DESCRIPTORS */
 	.byte	0
 
@@ -76,6 +79,9 @@
 #ifndef	MACH_PV_DESCRIPTORS
 						"|writable_descriptor_tables"
 #endif	/* MACH_PV_DESCRIPTORS */
+#ifndef	MACH_RING1
+						"|supervisor_mode_kernel"
+#endif	/* MACH_RING1 */
 	)
 
 #include <mach/machine/asm.h>
-- 
cgit v1.2.3