[Xen-changelog] Remove some unnecessary diffs vs. native Linux. We now don't use the Xen

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID b883ef5fad48486365537d15d20336c0bbcace83
# Parent  3dde684846837f45f83bb254b755bf2632e8cbcf
Remove some unnecessary diffs vs. native Linux. We now don't use the Xen
FLAT_foo segment selectors at all.

Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>

diff -r 3dde68484683 -r b883ef5fad48 
linux-2.6-xen-sparse/arch/i386/kernel/traps-xen.c
--- a/linux-2.6-xen-sparse/arch/i386/kernel/traps-xen.c Thu Feb 23 14:22:12 2006
+++ b/linux-2.6-xen-sparse/arch/i386/kernel/traps-xen.c Thu Feb 23 14:33:08 2006
@@ -1096,12 +1096,6 @@
 void smp_trap_init(trap_info_t *trap_ctxt)
 {
        trap_info_t *t = trap_table;
-       int i;
-
-       for (i = 0; i < 256; i++) {
-               trap_ctxt[i].vector = i;
-               trap_ctxt[i].cs     = FLAT_KERNEL_CS;
-       }
 
        for (t = trap_table; t->address; t++) {
                trap_ctxt[t->vector].flags = t->flags;
diff -r 3dde68484683 -r b883ef5fad48 
linux-2.6-xen-sparse/arch/x86_64/kernel/traps-xen.c
--- a/linux-2.6-xen-sparse/arch/x86_64/kernel/traps-xen.c       Thu Feb 23 
14:22:12 2006
+++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/traps-xen.c       Thu Feb 23 
14:33:08 2006
@@ -997,12 +997,6 @@
 void smp_trap_init(trap_info_t *trap_ctxt)
 {
        trap_info_t *t = trap_table;
-       int i;
-
-       for (i = 0; i < 256; i++) {
-               trap_ctxt[i].vector = i;
-               trap_ctxt[i].cs     = FLAT_KERNEL_CS;
-       }
 
        for (t = trap_table; t->address; t++) {
                trap_ctxt[t->vector].flags = t->flags;
diff -r 3dde68484683 -r b883ef5fad48 
linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/segment.h
--- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/segment.h      Thu Feb 
23 14:22:12 2006
+++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/segment.h      Thu Feb 
23 14:33:08 2006
@@ -87,9 +87,11 @@
 
 /* Simple and small GDT entries for booting only */
 
-#define __BOOT_CS      FLAT_KERNEL_CS
+#define GDT_ENTRY_BOOT_CS              2
+#define __BOOT_CS      (GDT_ENTRY_BOOT_CS * 8)
 
-#define __BOOT_DS      FLAT_KERNEL_DS
+#define GDT_ENTRY_BOOT_DS              (GDT_ENTRY_BOOT_CS + 1)
+#define __BOOT_DS      (GDT_ENTRY_BOOT_DS * 8)
 
 /* The PnP BIOS entries in the GDT */
 #define GDT_ENTRY_PNPBIOS_CS32         (GDT_ENTRY_PNPBIOS_BASE + 0)

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