Index: 2006-08-16/xen/arch/x86/boot/x86_32.S
===================================================================
--- 2006-08-16.orig/xen/arch/x86/boot/x86_32.S	2006-01-10 13:36:44.000000000 +0100
+++ 2006-08-16/xen/arch/x86/boot/x86_32.S	2006-08-22 09:22:34.000000000 +0200
@@ -196,21 +196,16 @@ ENTRY(stack_start)
         
 /*** DESCRIPTOR TABLES ***/
 
-.globl idt
-.globl gdt        
-
         ALIGN
         
         .word   0    
 idt_descr:
         .word	256*8-1
-idt:
         .long	idt_table
 
         .word   0
 gdt_descr:
         .word	LAST_RESERVED_GDT_BYTE
-gdt:
         .long   gdt_table - FIRST_RESERVED_GDT_BYTE
 
         .word   0
Index: 2006-08-16/xen/arch/x86/boot/x86_64.S
===================================================================
--- 2006-08-16.orig/xen/arch/x86/boot/x86_64.S	2006-08-22 09:21:20.000000000 +0200
+++ 2006-08-16/xen/arch/x86/boot/x86_64.S	2006-08-22 09:21:55.000000000 +0200
@@ -192,9 +192,6 @@ ignore_int:
 
 /*** DESCRIPTOR TABLES ***/
 
-.globl idt
-.globl gdt        
-
         .org    0x300
         .code32
 
@@ -212,13 +209,11 @@ cpuid_ext_features:   /* 0x310 */
         .word   0
 gdt_descr:
         .word   LAST_RESERVED_GDT_BYTE
-gdt:
         .quad   gdt_table - FIRST_RESERVED_GDT_BYTE
 
         .word   0,0,0
 idt_descr:
         .word   256*16-1
-idt:
         .quad   idt_table
 
 ENTRY(stack_start)
Index: 2006-08-16/xen/include/asm-x86/desc.h
===================================================================
--- 2006-08-16.orig/xen/include/asm-x86/desc.h	2006-02-28 17:35:12.000000000 +0100
+++ 2006-08-16/xen/include/asm-x86/desc.h	2006-08-22 09:21:55.000000000 +0200
@@ -155,17 +155,12 @@ __asm__ __volatile__ ("movw %w3,0(%2)\n\
 #endif
 
 extern struct desc_struct gdt_table[];
-extern struct desc_struct *gdt;
-extern idt_entry_t        *idt;
 
 struct Xgt_desc_struct {
     unsigned short size;
     unsigned long address __attribute__((packed));
 };
 
-#define idt_descr (*(struct Xgt_desc_struct *)((char *)&idt - 2))
-#define gdt_descr (*(struct Xgt_desc_struct *)((char *)&gdt - 2))
-
 extern void set_intr_gate(unsigned int irq, void * addr);
 extern void set_system_gate(unsigned int n, void *addr);
 extern void set_task_gate(unsigned int n, unsigned int sel);