diff options
| author | Ingo Molnar | 2008-07-14 11:37:46 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2008-07-14 11:37:46 +0200 |
| commit | d59fdcf2ac501de99c3dfb452af5e254d4342886 (patch) | |
| tree | ad5e2efd6f8aacf2a08b1ed8a54ddf96642e83f3 /include/asm-x86/desc.h | |
| parent | x86: make 64bit hpet_set_mapping to use ioremap too, v2 (diff) | |
| parent | Linux 2.6.26 (diff) | |
| download | kernel-qcow2-linux-d59fdcf2ac501de99c3dfb452af5e254d4342886.tar.gz kernel-qcow2-linux-d59fdcf2ac501de99c3dfb452af5e254d4342886.tar.xz kernel-qcow2-linux-d59fdcf2ac501de99c3dfb452af5e254d4342886.zip | |
Merge commit 'v2.6.26' into x86/core
Diffstat (limited to 'include/asm-x86/desc.h')
| -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 07f9f2b17be8..a44c4dc70590 100644 --- a/include/asm-x86/desc.h +++ b/include/asm-x86/desc.h @@ -188,8 +188,8 @@ static inline void native_set_ldt(const void *addr, unsigned int entries) 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)); |