ia64/xen-unstable

changeset 8980:b883ef5fad48

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@xensource.com>
author kaf24@firebug.cl.cam.ac.uk
date Thu Feb 23 15:33:08 2006 +0100 (2006-02-23)
parents 3dde68484683
children 13e4df60caf1
files linux-2.6-xen-sparse/arch/i386/kernel/traps-xen.c linux-2.6-xen-sparse/arch/x86_64/kernel/traps-xen.c linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/segment.h
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/i386/kernel/traps-xen.c	Thu Feb 23 15:22:12 2006 +0100
     1.2 +++ b/linux-2.6-xen-sparse/arch/i386/kernel/traps-xen.c	Thu Feb 23 15:33:08 2006 +0100
     1.3 @@ -1096,12 +1096,6 @@ void __init trap_init(void)
     1.4  void smp_trap_init(trap_info_t *trap_ctxt)
     1.5  {
     1.6  	trap_info_t *t = trap_table;
     1.7 -	int i;
     1.8 -
     1.9 -	for (i = 0; i < 256; i++) {
    1.10 -		trap_ctxt[i].vector = i;
    1.11 -		trap_ctxt[i].cs     = FLAT_KERNEL_CS;
    1.12 -	}
    1.13  
    1.14  	for (t = trap_table; t->address; t++) {
    1.15  		trap_ctxt[t->vector].flags = t->flags;
     2.1 --- a/linux-2.6-xen-sparse/arch/x86_64/kernel/traps-xen.c	Thu Feb 23 15:22:12 2006 +0100
     2.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/traps-xen.c	Thu Feb 23 15:33:08 2006 +0100
     2.3 @@ -997,12 +997,6 @@ void __init trap_init(void)
     2.4  void smp_trap_init(trap_info_t *trap_ctxt)
     2.5  {
     2.6  	trap_info_t *t = trap_table;
     2.7 -	int i;
     2.8 -
     2.9 -	for (i = 0; i < 256; i++) {
    2.10 -		trap_ctxt[i].vector = i;
    2.11 -		trap_ctxt[i].cs     = FLAT_KERNEL_CS;
    2.12 -	}
    2.13  
    2.14  	for (t = trap_table; t->address; t++) {
    2.15  		trap_ctxt[t->vector].flags = t->flags;
     3.1 --- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/segment.h	Thu Feb 23 15:22:12 2006 +0100
     3.2 +++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/segment.h	Thu Feb 23 15:33:08 2006 +0100
     3.3 @@ -87,9 +87,11 @@
     3.4  
     3.5  /* Simple and small GDT entries for booting only */
     3.6  
     3.7 -#define __BOOT_CS	FLAT_KERNEL_CS
     3.8 +#define GDT_ENTRY_BOOT_CS		2
     3.9 +#define __BOOT_CS	(GDT_ENTRY_BOOT_CS * 8)
    3.10  
    3.11 -#define __BOOT_DS	FLAT_KERNEL_DS
    3.12 +#define GDT_ENTRY_BOOT_DS		(GDT_ENTRY_BOOT_CS + 1)
    3.13 +#define __BOOT_DS	(GDT_ENTRY_BOOT_DS * 8)
    3.14  
    3.15  /* The PnP BIOS entries in the GDT */
    3.16  #define GDT_ENTRY_PNPBIOS_CS32		(GDT_ENTRY_PNPBIOS_BASE + 0)