diff --git a/[refs] b/[refs]
index f1b7f549ea93..b3043f3ad4fc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de09bddb9d6f96785be470c832b881e6d72d589f
+refs/heads/master: 2817716ace8c397685bd702223cc5a8a42c7e997
diff --git a/trunk/include/asm-i386/desc.h b/trunk/include/asm-i386/desc.h
index 5db9e96e8dc1..5874ef119ffd 100644
--- a/trunk/include/asm-i386/desc.h
+++ b/trunk/include/asm-i386/desc.h
@@ -46,7 +46,7 @@ static inline void pack_descriptor(__u32 *a, __u32 *b,
 {
 	*a = ((base & 0xffff) << 16) | (limit & 0xffff);
 	*b = (base & 0xff000000) | ((base & 0xff0000) >> 16) |
-	     ((type & 0xff) << 8) | ((flags & 0xf) << 12);
+		(limit & 0x000f0000) | ((type & 0xff) << 8) | ((flags & 0xf) << 20);
 }
 
 static inline void pack_gate(__u32 *a, __u32 *b,