5 files changed, 30 insertions, 8 deletions

diff --git a/arch/i386/kernel/irq.c b/arch/i386/kernel/irq.c
index c703bc7b088..9eec9435318 100644
--- a/arch/i386/kernel/irq.c
+++ b/arch/i386/kernel/irq.c
@@ -60,6 +60,12 @@ fastcall unsigned int do_IRQ(struct pt_regs *regs)
         u32 *isp;
 #endif
 
+        if (unlikely((unsigned)irq >= NR_IRQS)) {
+                printk(KERN_EMERG "%s: cannot handle IRQ %d\n",
+                                        __FUNCTION__, irq);
+                BUG();
+        }
+
         irq_enter();
 #ifdef CONFIG_DEBUG_STACKOVERFLOW
         /* Debugging check for stack overflow: is there less than 1KB free? */
diff --git a/arch/i386/kernel/sysenter.c b/arch/i386/kernel/sysenter.c
index c60419dee01..713ba39d32c 100644
--- a/arch/i386/kernel/sysenter.c
+++ b/arch/i386/kernel/sysenter.c
@@ -148,8 +148,10 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int exstack)
         vma->vm_mm = mm;
 
         ret = insert_vm_struct(mm, vma);
-        if (ret)
-                goto free_vma;
+        if (unlikely(ret)) {
+                kmem_cache_free(vm_area_cachep, vma);
+                goto up_fail;
+        }
 
         current->mm->context.vdso = (void *)addr;
         current_thread_info()->sysenter_return =
@@ -158,10 +160,6 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int exstack)
 up_fail:
         up_write(&mm->mmap_sem);
         return ret;
-
-free_vma:
-        kmem_cache_free(vm_area_cachep, vma);
-        return ret;
 }
 
 const char *arch_vma_name(struct vm_area_struct *vma)
diff --git a/arch/powerpc/platforms/powermac/backlight.c b/arch/powerpc/platforms/powermac/backlight.c
index 498b042e183..c7a27eddca6 100644
--- a/arch/powerpc/platforms/powermac/backlight.c
+++ b/arch/powerpc/platforms/powermac/backlight.c
@@ -119,7 +119,14 @@ int pmac_backlight_set_legacy_brightness(int brightness)
                 down(&pmac_backlight->sem);
                 props = pmac_backlight->props;
                 props->brightness = brightness *
-                        props->max_brightness / OLD_BACKLIGHT_MAX;
+                        (props->max_brightness + 1) /
+                        (OLD_BACKLIGHT_MAX + 1);
+
+                if (props->brightness > props->max_brightness)
+                        props->brightness = props->max_brightness;
+                else if (props->brightness < 0)
+                        props->brightness = 0;
+
                 props->update_status(pmac_backlight);
                 up(&pmac_backlight->sem);
 
@@ -140,8 +147,11 @@ int pmac_backlight_get_legacy_brightness()
 
                 down(&pmac_backlight->sem);
                 props = pmac_backlight->props;
+
                 result = props->brightness *
-                        OLD_BACKLIGHT_MAX / props->max_brightness;
+                        (OLD_BACKLIGHT_MAX + 1) /
+                        (props->max_brightness + 1);
+
                 up(&pmac_backlight->sem);
         }
         mutex_unlock(&pmac_backlight_mutex);
diff --git a/arch/x86_64/kernel/irq.c b/arch/x86_64/kernel/irq.c
index 3be0a7e4bf0..bfa82f52a5c 100644
--- a/arch/x86_64/kernel/irq.c
+++ b/arch/x86_64/kernel/irq.c
@@ -118,6 +118,12 @@ asmlinkage unsigned int do_IRQ(struct pt_regs *regs)
         /* high bit used in ret_from_ code  */
         unsigned irq = ~regs->orig_rax;
 
+        if (unlikely(irq >= NR_IRQS)) {
+                printk(KERN_EMERG "%s: cannot handle IRQ %d\n",
+                                        __FUNCTION__, irq);
+                BUG();
+        }
+
         exit_idle();
         irq_enter();
 #ifdef CONFIG_DEBUG_STACKOVERFLOW
diff --git a/arch/x86_64/kernel/nmi.c b/arch/x86_64/kernel/nmi.c
index 399489c9313..0ef9cf2bc45 100644
--- a/arch/x86_64/kernel/nmi.c
+++ b/arch/x86_64/kernel/nmi.c
@@ -607,11 +607,13 @@ void set_nmi_callback(nmi_callback_t callback)
         vmalloc_sync_all();
         rcu_assign_pointer(nmi_callback, callback);
 }
+EXPORT_SYMBOL_GPL(set_nmi_callback);
 
 void unset_nmi_callback(void)
 {
         nmi_callback = dummy_nmi_callback;
 }
+EXPORT_SYMBOL_GPL(unset_nmi_callback);
 
 #ifdef CONFIG_SYSCTL