---

yaml --- r: 168268 b: refs/heads/master c: 2c75910 h: refs/heads/master v: v3
git-mirror · Nov 5, 2009 · 23d7dc0 · 23d7dc0
1 parent 8c1d5f2
commit 23d7dc0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a6fc8d0f8c3ee3d42417e8315fc8c8fae1d3213
+refs/heads/master: 2c75910f1aa042be1dd769378d2611bf551721ac
diff --git a/trunk/arch/x86/include/asm/desc.h b/trunk/arch/x86/include/asm/desc.h
@@ -288,7 +288,7 @@ static inline void load_LDT(mm_context_t *pc)
 
 static inline unsigned long get_desc_base(const struct desc_struct *desc)
 {
-	return desc->base0 | ((desc->base1) << 16) | ((desc->base2) << 24);
+	return (unsigned)(desc->base0 | ((desc->base1) << 16) | ((desc->base2) << 24));
 }
 
 static inline void set_desc_base(struct desc_struct *desc, unsigned long base)