diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/ldt.c b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/ldt.c
index 675509e0be..363010f1ed 100644
--- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/ldt.c
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/ldt.c
@@ -134,9 +134,11 @@ void destroy_context(struct mm_struct *mm)
 			kfree(mm->context.ldt);
 		mm->context.size = 0;
 	}
-	spin_lock(&mm_unpinned_lock);
-	list_del(&mm->context.unpinned);
-	spin_unlock(&mm_unpinned_lock);
+	if (!mm->context.pinned) {
+		spin_lock(&mm_unpinned_lock);
+		list_del(&mm->context.unpinned);
+		spin_unlock(&mm_unpinned_lock);
+	}
 }
 
 static int read_ldt(void __user * ptr, unsigned long bytecount)