From 455c0267d6ff3a93c72658afdc26895ed0cf4f90 Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy@goop.org>
Date: Sun, 27 Jul 2008 08:42:32 -0700
Subject: [PATCH] --- yaml --- r: 113226 b: refs/heads/master c:
 64f53a0492b4bc11868307990bb8f7c1e0764f89 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/include/asm-x86/desc.h | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ed1f432202c0..197e84a00da6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b56afe1d41653fb07ab1b5af5ccc12001c4dd5a0
+refs/heads/master: 64f53a0492b4bc11868307990bb8f7c1e0764f89
diff --git a/trunk/include/asm-x86/desc.h b/trunk/include/asm-x86/desc.h
index 24a524f5e1a2..06f786f4b4fb 100644
--- a/trunk/include/asm-x86/desc.h
+++ b/trunk/include/asm-x86/desc.h
@@ -24,6 +24,11 @@ static inline void fill_ldt(struct desc_struct *desc,
 	desc->d = info->seg_32bit;
 	desc->g = info->limit_in_pages;
 	desc->base2 = (info->base_addr & 0xff000000) >> 24;
+	/*
+	 * Don't allow setting of the lm bit. It is useless anyway
+	 * because 64bit system calls require __USER_CS:
+	 */
+	desc->l = 0;
 }
 
 extern struct desc_ptr idt_descr;