Merge commit 'v2.6.26' into x86/core

2 files changed, 3 insertions, 3 deletions

diff --git a/include/asm-frv/system.h b/include/asm-frv/system.h
index d3a12a9079f7..7742ec000cc4 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 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));