1.1 --- a/xen/arch/x86/boot/x86_32.S	Mon Nov 13 13:39:16 2006 +0000
     1.2 +++ b/xen/arch/x86/boot/x86_32.S	Mon Nov 13 13:40:21 2006 +0000
     1.3 @@ -196,21 +196,16 @@ ENTRY(stack_start)
     1.4          
     1.5  /*** DESCRIPTOR TABLES ***/
     1.6  
     1.7 -.globl idt
     1.8 -.globl gdt        
     1.9 -
    1.10          ALIGN
    1.11          
    1.12          .word   0    
    1.13  idt_descr:
    1.14          .word   256*8-1
    1.15 -idt:
    1.16          .long   idt_table
    1.17  
    1.18          .word   0
    1.19  gdt_descr:
    1.20          .word   LAST_RESERVED_GDT_BYTE
    1.21 -gdt:
    1.22          .long   gdt_table - FIRST_RESERVED_GDT_BYTE
    1.23  
    1.24          .word   0

     2.1 --- a/xen/arch/x86/boot/x86_64.S	Mon Nov 13 13:39:16 2006 +0000
     2.2 +++ b/xen/arch/x86/boot/x86_64.S	Mon Nov 13 13:40:21 2006 +0000
     2.3 @@ -192,9 +192,6 @@ 1:      jmp     1b
     2.4  
     2.5  /*** DESCRIPTOR TABLES ***/
     2.6  
     2.7 -.globl idt
     2.8 -.globl gdt        
     2.9 -
    2.10          .align 8, 0xCC
    2.11  multiboot_ptr:
    2.12          .long   0
    2.13 @@ -210,13 +207,11 @@ cpuid_ext_features:
    2.14          .word   0
    2.15  gdt_descr:
    2.16          .word   LAST_RESERVED_GDT_BYTE
    2.17 -gdt:
    2.18          .quad   gdt_table - FIRST_RESERVED_GDT_BYTE
    2.19  
    2.20          .word   0,0,0
    2.21  idt_descr:
    2.22          .word   256*16-1
    2.23 -idt:
    2.24          .quad   idt_table
    2.25  
    2.26  ENTRY(stack_start)

     3.1 --- a/xen/include/asm-x86/desc.h	Mon Nov 13 13:39:16 2006 +0000
     3.2 +++ b/xen/include/asm-x86/desc.h	Mon Nov 13 13:40:21 2006 +0000
     3.3 @@ -155,17 +155,12 @@ do { \
     3.4  #endif
     3.5  
     3.6  extern struct desc_struct gdt_table[];
     3.7 -extern struct desc_struct *gdt;
     3.8 -extern idt_entry_t        *idt;
     3.9  
    3.10  struct Xgt_desc_struct {
    3.11      unsigned short size;
    3.12      unsigned long address __attribute__((packed));
    3.13  };
    3.14  
    3.15 -#define idt_descr (*(struct Xgt_desc_struct *)((char *)&idt - 2))
    3.16 -#define gdt_descr (*(struct Xgt_desc_struct *)((char *)&gdt - 2))
    3.17 -
    3.18  extern void set_intr_gate(unsigned int irq, void * addr);
    3.19  extern void set_system_gate(unsigned int n, void *addr);
    3.20  extern void set_task_gate(unsigned int n, unsigned int sel);