--- /dev/null
+From 5ac37f87ff18843aabab84cf75b2f8504c2d81fe Mon Sep 17 00:00:00 2001
+From: Michael Karcher <kernel@mkarcher.dialup.fu-berlin.de>
+Date: Fri, 11 Jul 2008 18:04:46 +0200
+Subject: x86: fix ldt limit for 64 bit
+
+commit 5ac37f87ff18843aabab84cf75b2f8504c2d81fe upstream
+
+Fix size of LDT entries. On x86-64, ldt_desc is a double-sized descriptor.
+
+Signed-off-by: Michael Karcher <kernel@mkarcher.dialup.fu-berlin.de>
+Signed-off-by: Ingo Molnar <mingo@elte.hu>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ include/asm-x86/desc.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/include/asm-x86/desc.h
++++ b/include/asm-x86/desc.h
+@@ -191,8 +191,8 @@ static inline void native_set_ldt(const
+ unsigned cpu = smp_processor_id();
+ ldt_desc ldt;
+
+- set_tssldt_descriptor(&ldt, (unsigned long)addr,
+- DESC_LDT, entries * sizeof(ldt) - 1);
++ set_tssldt_descriptor(&ldt, (unsigned long)addr, DESC_LDT,
++ entries * LDT_ENTRY_SIZE - 1);
+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_LDT,
+ &ldt, DESC_LDT);
+ __asm__ __volatile__("lldt %w0"::"q" (GDT_ENTRY_LDT*8));