diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-12-07 13:14:12 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-12-07 13:14:18 +0100 |
| commit | f3d607c6b39bd9cb5000e03e2c0dc2afe1241374 (patch) | |
| tree | 885b5e0b5bb3d87efc4bfbde69feff2ece32ecac /arch/x86/include/asm/desc.h | |
| parent | x86: Fix typo in arch/x86/mm/kmmio.c (diff) | |
| parent | Merge branch 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| download | linux-f3d607c6b39bd9cb5000e03e2c0dc2afe1241374.tar.xz linux-f3d607c6b39bd9cb5000e03e2c0dc2afe1241374.zip | |
Merge branch 'linus' into x86/urgent
Merge reason: we want to queue up a dependent fix.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/include/asm/desc.h')
| -rw-r--r-- | arch/x86/include/asm/desc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h index e8de2f6f5ca5..617bd56b3070 100644 --- a/arch/x86/include/asm/desc.h +++ b/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) |