diff options
| author | Deepak Saxena <dsaxena@laptop.org> | 2008-07-16 10:15:42 -0700 |
|---|---|---|
| committer | Deepak Saxena <dsaxena@laptop.org> | 2008-07-16 10:15:42 -0700 |
| commit | 08ad05ca80e789b94e193678f1c280578563dba9 (patch) | |
| tree | 18e7cd1c04d9bf5ce248b97edf79925380a2527d | |
| parent | ef92c83e1c0d23a52a79075a8b2fbc45dc1b6d03 (diff) | |
| parent | 6daa065a07f0fa50d1f9d16afec33c767ae31723 (diff) | |
| download | lwn-08ad05ca80e789b94e193678f1c280578563dba9.tar.gz lwn-08ad05ca80e789b94e193678f1c280578563dba9.zip | |
Merge commit 'v2.6.25.11' into olpc-testing
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | include/asm-x86/desc.h | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 25 -EXTRAVERSION = .10 +EXTRAVERSION = .11 NAME = Funky Weasel is Jiggy wit it # *DOCUMENTATION* diff --git a/include/asm-x86/desc.h b/include/asm-x86/desc.h index 5b6a05d3a771..76ea17a52586 100644 --- a/include/asm-x86/desc.h +++ b/include/asm-x86/desc.h @@ -191,8 +191,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)); |