Merge branch 'linus'

7 files changed, 15 insertions, 18 deletions

diff --git a/arch/arm/kernel/apm.c b/arch/arm/kernel/apm.c
index 766b6c05c6db..2bed290fec76 100644
--- a/arch/arm/kernel/apm.c
+++ b/arch/arm/kernel/apm.c
@@ -357,10 +357,8 @@ static int apm_open(struct inode * inode, struct file * filp)
 {
         struct apm_user *as;
 
-        as = (struct apm_user *)kmalloc(sizeof(*as), GFP_KERNEL);
+        as = (struct apm_user *)kzalloc(sizeof(*as), GFP_KERNEL);
         if (as) {
-                memset(as, 0, sizeof(*as));
-
                 /*
                  * XXX - this is a tiny bit broken, when we consider BSD
                  * process accounting. If the device is opened by root, we
diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c
index c4923fac8dff..de606dfa8db9 100644
--- a/arch/arm/kernel/bios32.c
+++ b/arch/arm/kernel/bios32.c
@@ -540,12 +540,10 @@ static void __init pcibios_init_hw(struct hw_pci *hw)
         int nr, busnr;
 
         for (nr = busnr = 0; nr < hw->nr_controllers; nr++) {
-                sys = kmalloc(sizeof(struct pci_sys_data), GFP_KERNEL);
+                sys = kzalloc(sizeof(struct pci_sys_data), GFP_KERNEL);
                 if (!sys)
                         panic("PCI: unable to allocate sys data!");
 
-                memset(sys, 0, sizeof(struct pci_sys_data));
-
                 sys->hw      = hw;
                 sys->busnr   = busnr;
                 sys->swizzle = hw->swizzle;
diff --git a/arch/arm/kernel/debug.S b/arch/arm/kernel/debug.S
index caaa919ab47a..da280bae3d07 100644
--- a/arch/arm/kernel/debug.S
+++ b/arch/arm/kernel/debug.S
@@ -11,7 +11,6 @@
  */
 #include <linux/config.h>
 #include <linux/linkage.h>
-#include <asm/hardware.h>
 
                 .text
 
diff --git a/arch/arm/kernel/ecard.c b/arch/arm/kernel/ecard.c
index 74ea29c3205e..00aa225e8d95 100644
--- a/arch/arm/kernel/ecard.c
+++ b/arch/arm/kernel/ecard.c
@@ -807,14 +807,12 @@ static struct expansion_card *__init ecard_alloc_card(int type, int slot)
         unsigned long base;
         int i;
 
-        ec = kmalloc(sizeof(ecard_t), GFP_KERNEL);
+        ec = kzalloc(sizeof(ecard_t), GFP_KERNEL);
         if (!ec) {
                 ec = ERR_PTR(-ENOMEM);
                 goto nomem;
         }
 
-        memset(ec, 0, sizeof(ecard_t));
-
         ec->slot_no = slot;
         ec->type = type;
         ec->irq = NO_IRQ;
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
index ec48d70c6d8b..355914ffb192 100644
--- a/arch/arm/kernel/entry-armv.S
+++ b/arch/arm/kernel/entry-armv.S
@@ -484,7 +484,6 @@ call_fpe:
         movcss  r7, r5, lsr #(TIF_USING_IWMMXT + 1)
         bcs     iwmmxt_task_enable
 #endif
-        enable_irq
         add     pc, pc, r8, lsr #6
         mov     r0, r0
 
@@ -511,6 +510,7 @@ call_fpe:
         mov     pc, lr                          @ CP#15 (Control)
 
 do_fpe:
+        enable_irq
         ldr     r4, .LCfp
         add     r10, r10, #TI_FPSTATE           @ r10 = workspace
         ldr     pc, [r4]                        @ Call FP module USR entry point
diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
index 1aca1775b28f..84277fe818a1 100644
--- a/arch/arm/kernel/head.S
+++ b/arch/arm/kernel/head.S
@@ -28,10 +28,9 @@
 #define PROCINFO_INITFUNC       12
 
 #define MACHINFO_TYPE           0
-#define MACHINFO_PHYSRAM        4
-#define MACHINFO_PHYSIO         8
-#define MACHINFO_PGOFFIO        12
-#define MACHINFO_NAME           16
+#define MACHINFO_PHYSIO         4
+#define MACHINFO_PGOFFIO        8
+#define MACHINFO_NAME           12
 
 #define KERNEL_RAM_ADDR (PAGE_OFFSET + TEXT_OFFSET)
 
diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c
index 1d50d2b98f55..2d5896b36181 100644
--- a/arch/arm/kernel/irq.c
+++ b/arch/arm/kernel/irq.c
@@ -305,14 +305,19 @@ report_bad_irq(unsigned int irq, struct pt_regs *regs, struct irqdesc *desc, int
         static int count = 100;
         struct irqaction *action;
 
-        if (!count || noirqdebug)
+        if (noirqdebug)
                 return;
 
-        count--;
-
         if (ret != IRQ_HANDLED && ret != IRQ_NONE) {
+                if (!count)
+                        return;
+                count--;
                 printk("irq%u: bogus retval mask %x\n", irq, ret);
         } else {
+                desc->irqs_unhandled++;
+                if (desc->irqs_unhandled <= 99900)
+                        return;
+                desc->irqs_unhandled = 0;
                 printk("irq%u: nobody cared\n", irq);
         }
         show_regs(regs);