diff --git a/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/entry.S b/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/entry.S
index e3a20d05ef..42f0e3e514 100644
--- a/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/entry.S
+++ b/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/entry.S
@@ -118,10 +118,9 @@ VM_MASK		= 0x00020000
 	pushl %edx; \
 	pushl %ecx; \
 	pushl %ebx; \
-	movl $(__KERNEL_DS), %edx; \
+	movl $(__USER_DS), %edx; \
 	movl %edx, %ds; \
 	movl %edx, %es;
-	# XXXcl USER?
 
 #define RESTORE_INT_REGS \
 	popl %ebx;	\
diff --git a/linux-2.6.9-xen-sparse/drivers/xen/blkfront/block.h b/linux-2.6.9-xen-sparse/drivers/xen/blkfront/block.h
index ace010e0fb..f50ce03bca 100644
--- a/linux-2.6.9-xen-sparse/drivers/xen/blkfront/block.h
+++ b/linux-2.6.9-xen-sparse/drivers/xen/blkfront/block.h
@@ -64,6 +64,7 @@
 
 struct xlbd_type_info {
 	int partn_shift;
+	int partn_per_major;
 	int devs_per_major;
 	int hardsect_size;
 	int max_sectors;
@@ -77,8 +78,8 @@ struct xlbd_type_info {
  */
 struct xlbd_major_info {
 	int major;
+	int index;
 	int usage;
-	int xd_device;
 	struct xlbd_type_info *type;
 };
 
diff --git a/linux-2.6.9-xen-sparse/drivers/xen/blkfront/vbd.c b/linux-2.6.9-xen-sparse/drivers/xen/blkfront/vbd.c
index d2cfb7cf5a..684db78e99 100644
--- a/linux-2.6.9-xen-sparse/drivers/xen/blkfront/vbd.c
+++ b/linux-2.6.9-xen-sparse/drivers/xen/blkfront/vbd.c
@@ -44,6 +44,7 @@
 
 static struct xlbd_type_info xlbd_ide_type = {
 	.partn_shift = 6,
+	.partn_per_major = 2,
 	// XXXcl todo blksize_size[major]  = 1024;
 	.hardsect_size = 512,
 	.max_sectors = 128,  /* 'hwif->rqsize' if we knew it */
@@ -53,6 +54,7 @@ static struct xlbd_type_info xlbd_ide_type = {
 
 static struct xlbd_type_info xlbd_scsi_type = {
 	.partn_shift = 4,
+	.partn_per_major = 16,
 	// XXXcl todo blksize_size[major]  = 1024; /* XXX 512; */
 	.hardsect_size = 512,
 	.max_sectors = 128*8, /* XXX 128; */
@@ -62,6 +64,7 @@ static struct xlbd_type_info xlbd_scsi_type = {
 
 static struct xlbd_type_info xlbd_vbd_type = {
 	.partn_shift = 4,
+	.partn_per_major = 16,
 	// XXXcl todo blksize_size[major]  = 512;
 	.hardsect_size = 512,
 	.max_sectors = 128,
@@ -167,13 +170,17 @@ static struct xlbd_major_info *xlbd_get_major_info(int xd_device, int *minor)
 	switch (mi_idx) {
 	case 0 ... (NUM_IDE_MAJORS - 1):
 		major_info[mi_idx]->type = &xlbd_ide_type;
+		major_info[mi_idx]->index = mi_idx;
 		break;
 	case NUM_IDE_MAJORS ... (NUM_IDE_MAJORS + NUM_SCSI_MAJORS - 1):
 		major_info[mi_idx]->type = &xlbd_scsi_type;
+		major_info[mi_idx]->index = mi_idx - NUM_IDE_MAJORS;
 		break;
 	case (NUM_IDE_MAJORS + NUM_SCSI_MAJORS) ...
 		(NUM_IDE_MAJORS + NUM_SCSI_MAJORS + NUM_VBD_MAJORS - 1):
 		major_info[mi_idx]->type = &xlbd_vbd_type;
+		major_info[mi_idx]->index = mi_idx -
+			(NUM_IDE_MAJORS + NUM_SCSI_MAJORS);
 		break;
 	}
 	major_info[mi_idx]->major = new_major;
@@ -222,7 +229,8 @@ static struct gendisk *xlvbd_get_gendisk(struct xlbd_major_info *mi,
 	gd->fops = &xlvbd_block_fops;
 	gd->private_data = di;
 	sprintf(gd->disk_name, "%s%c%d", mi->type->name,
-	    'a' + (xd_minor >> mi->type->partn_shift),
+	    'a' + mi->index * mi->type->partn_per_major +
+		(xd_minor >> mi->type->partn_shift),
 	    xd_minor & ((1 << mi->type->partn_shift) - 1));
 	/*  sprintf(gd->devfs_name, "%s%s/disc%d", mi->type->name, , ); XXXdevfs */
 
diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py
index 963a0c8ea8..335da5e486 100644
--- a/tools/python/xen/xend/XendDomainInfo.py
+++ b/tools/python/xen/xend/XendDomainInfo.py
@@ -994,13 +994,13 @@ class XendDomainInfo:
 
         @return: deferred
         """
-        if (self.get_devices("vbd") == None):
+        if self.get_devices("vbd") == []:
             ctrl = xend.blkif_create(self.dom, recreate=self.recreate)
             back = ctrl.getBackendInterface(0)
             return back.connect(recreate=self.recreate)
         else:
             return None
-    
+
     def dom_construct(self, dom, config):
         """Construct a vm for an existing domain.
 
diff --git a/xen/arch/x86/extable.c b/xen/arch/x86/extable.c
index 54251cc3c5..d3292027e0 100644
--- a/xen/arch/x86/extable.c
+++ b/xen/arch/x86/extable.c
@@ -3,6 +3,36 @@
 #include <xen/spinlock.h>
 #include <asm/uaccess.h>
 
+extern struct exception_table_entry __start___ex_table[];
+extern struct exception_table_entry __stop___ex_table[];
+extern struct exception_table_entry __start___pre_ex_table[];
+extern struct exception_table_entry __stop___pre_ex_table[];
+
+static void sort_exception_table(struct exception_table_entry *start,
+                                 struct exception_table_entry *end)
+{
+    struct exception_table_entry *p, *q, tmp;
+
+    for ( p = start; p < end; p++ )
+    {
+        for ( q = p-1; q > start; q-- )
+            if ( p->insn > q->insn )
+                break;
+        if ( ++q != p )
+        {
+            tmp = *p;
+            memmove(q+1, q, (p-q)*sizeof(*p));
+            *q = tmp;
+        }
+    }
+}
+
+void sort_exception_tables(void)
+{
+    sort_exception_table(__start___ex_table, __stop___ex_table);
+    sort_exception_table(__start___pre_ex_table, __stop___pre_ex_table);
+}
+
 static inline unsigned long
 search_one_table(const struct exception_table_entry *first,
 		 const struct exception_table_entry *last,
@@ -28,21 +58,15 @@ search_one_table(const struct exception_table_entry *first,
 unsigned long
 search_exception_table(unsigned long addr)
 {
-    extern const struct exception_table_entry __start___ex_table[];
-    extern const struct exception_table_entry __stop___ex_table[];
     return search_one_table(
         __start___ex_table, __stop___ex_table-1, addr);
 }
 
-#ifdef __i386__
 unsigned long
 search_pre_exception_table(unsigned long addr)
 {
-    extern const struct exception_table_entry __start___pre_ex_table[];
-    extern const struct exception_table_entry __stop___pre_ex_table[];
     unsigned long fixup = search_one_table(
         __start___pre_ex_table, __stop___pre_ex_table-1, addr);
     DPRINTK("Pre-exception: %08lx -> %08lx\n", addr, fixup);
     return fixup;
 }
-#endif
diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
index 2e9d65ea0e..e978dfe49a 100644
--- a/xen/arch/x86/setup.c
+++ b/xen/arch/x86/setup.c
@@ -326,6 +326,8 @@ void __init start_of_day(void)
     if ( opt_watchdog ) 
         nmi_watchdog = NMI_LOCAL_APIC;
 
+    sort_exception_tables();
+
     /* Tell the PCI layer not to allocate too close to the RAM area.. */
     low_mem_size = ((max_page << PAGE_SHIFT) + 0xfffff) & ~0xfffff;
     if ( low_mem_size > pci_mem_start ) pci_mem_start = low_mem_size;
diff --git a/xen/include/asm-x86/x86_32/uaccess.h b/xen/include/asm-x86/x86_32/uaccess.h
index 1b1b28bfe5..7531a29445 100644
--- a/xen/include/asm-x86/x86_32/uaccess.h
+++ b/xen/include/asm-x86/x86_32/uaccess.h
@@ -85,6 +85,7 @@ struct exception_table_entry
 };
 
 extern unsigned long search_exception_table(unsigned long);
+extern void sort_exception_tables(void);
 
 /**
  * get_user: - Get a simple variable from user space.