diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-14 09:37:46 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-14 09:37:46 (GMT) |
| commit | d59fdcf2ac501de99c3dfb452af5e254d4342886 (patch) | |
| tree | ad5e2efd6f8aacf2a08b1ed8a54ddf96642e83f3 /include | |
| parent | 2387ce57a8167490d3b34a7e1ffa9a64a1a76244 (diff) | |
| parent | bce7f793daec3e65ec5c5705d2457b81fe7b5725 (diff) | |
| download | linux-d59fdcf2ac501de99c3dfb452af5e254d4342886.tar.xz | |
Merge commit 'v2.6.26' into x86/core
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-frv/system.h | 2 | ||||
| -rw-r--r-- | include/asm-x86/desc.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-frv/system.h b/include/asm-frv/system.h index d3a12a9..7742ec0 100644 --- a/include/asm-frv/system.h +++ b/include/asm-frv/system.h @@ -87,7 +87,7 @@ do { \ } while(0) #define irqs_disabled() \ - ({unsigned long flags; local_save_flags(flags); flags; }) + ({unsigned long flags; local_save_flags(flags); !!flags; }) #define local_irq_save(flags) \ do { \ diff --git a/include/asm-x86/desc.h b/include/asm-x86/desc.h index 07f9f2b..a44c4dc 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)); |