Merge branch 'linus' into x86/xen

Conflicts:
	arch/x86/kernel/cpu/common.c
	arch/x86/kernel/process_64.c
	arch/x86/xen/enlighten.c

1 files changed, 2 insertions, 5 deletions

diff --git a/arch/arm/mach-s3c2443/irq.c b/arch/arm/mach-s3c2443/irq.c
index 9674de7223fd..e44341d7dfef 100644
--- a/arch/arm/mach-s3c2443/irq.c
+++ b/arch/arm/mach-s3c2443/irq.c
@@ -24,10 +24,10 @@
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
 #include <linux/sysdev.h>
+#include <linux/io.h>
 
 #include <mach/hardware.h>
 #include <asm/irq.h>
-#include <asm/io.h>
 
 #include <asm/mach/irq.h>
 
@@ -44,7 +44,6 @@ static inline void s3c2443_irq_demux(unsigned int irq, unsigned int len)
 {
         unsigned int subsrc, submsk;
         unsigned int end;
-        struct irq_desc *mydesc;
 
         /* read the current pending interrupts, and the mask
          * for what it is available */
@@ -57,13 +56,11 @@ static inline void s3c2443_irq_demux(unsigned int irq, unsigned int len)
         subsrc  &= (1 << len)-1;
 
         end = len + irq;
-        mydesc = irq_desc + irq;
 
         for (; irq < end && subsrc; irq++) {
                 if (subsrc & 1)
-                        desc_handle_irq(irq, mydesc);
+                        generic_handle_irq(irq);
 
-                mydesc++;
                 subsrc >>= 1;
         }
 }