diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-12 17:34:31 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-12 17:34:31 -0400 |
| commit | 9df2fe986770bc4c76e8fe72c20b71268eec39a7 (patch) | |
| tree | a25c18d5c0e9d70c27f16d788dd425f9640bb0aa | |
| parent | de72aa4c2b82a6cffe15d86a8d391ded4fb57602 (diff) | |
| parent | 5ac37f87ff18843aabab84cf75b2f8504c2d81fe (diff) | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: fix ldt limit for 64 bit
| -rw-r--r-- | include/asm-x86/desc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-x86/desc.h b/include/asm-x86/desc.h index 268a012bcd79..28bddbcb38be 100644 --- a/include/asm-x86/desc.h +++ b/include/asm-x86/desc.h | |||
| @@ -192,8 +192,8 @@ static inline void native_set_ldt(const void *addr, unsigned int entries) | |||
| 192 | unsigned cpu = smp_processor_id(); | 192 | unsigned cpu = smp_processor_id(); |
| 193 | ldt_desc ldt; | 193 | ldt_desc ldt; |
| 194 | 194 | ||
| 195 | set_tssldt_descriptor(&ldt, (unsigned long)addr, | 195 | set_tssldt_descriptor(&ldt, (unsigned long)addr, DESC_LDT, |
| 196 | DESC_LDT, entries * sizeof(ldt) - 1); | 196 | entries * LDT_ENTRY_SIZE - 1); |
| 197 | write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_LDT, | 197 | write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_LDT, |
| 198 | &ldt, DESC_LDT); | 198 | &ldt, DESC_LDT); |
| 199 | asm volatile("lldt %w0"::"q" (GDT_ENTRY_LDT*8)); | 199 | asm volatile("lldt %w0"::"q" (GDT_ENTRY_LDT*8)); |