Merge Linus' tree.

2 files changed, 14 insertions, 9 deletions

diff --git a/arch/arm/kernel/asm-offsets.c b/arch/arm/kernel/asm-offsets.c
index 04d3082a7b94..0abbce8c70bc 100644
--- a/arch/arm/kernel/asm-offsets.c
+++ b/arch/arm/kernel/asm-offsets.c
@@ -23,20 +23,15 @@
 #error Sorry, your compiler targets APCS-26 but this kernel requires APCS-32
 #endif
 /*
- * GCC 2.95.1, 2.95.2: ignores register clobber list in asm().
  * GCC 3.0, 3.1: general bad code generation.
  * GCC 3.2.0: incorrect function argument offset calculation.
  * GCC 3.2.x: miscompiles NEW_AUX_ENT in fs/binfmt_elf.c
  *            (http://gcc.gnu.org/PR8896) and incorrect structure
  *            initialisation in fs/jffs2/erase.c
  */
-#if __GNUC__ < 2 || \
-   (__GNUC__ == 2 && __GNUC_MINOR__ < 95) || \
-   (__GNUC__ == 2 && __GNUC_MINOR__ == 95 && __GNUC_PATCHLEVEL__ != 0 && \
-                                             __GNUC_PATCHLEVEL__ < 3) || \
-   (__GNUC__ == 3 && __GNUC_MINOR__ < 3)
+#if (__GNUC__ == 3 && __GNUC_MINOR__ < 3)
 #error Your compiler is too buggy; it is known to miscompile kernels.
-#error    Known good compilers: 2.95.3, 2.95.4, 2.96, 3.3
+#error    Known good compilers: 3.3
 #endif
 
 /* Use marker if you need to separate the values later */
diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c
index 869c466e6258..b5645c4462cf 100644
--- a/arch/arm/kernel/irq.c
+++ b/arch/arm/kernel/irq.c
@@ -684,8 +684,12 @@ int setup_irq(unsigned int irq, struct irqaction *new)
         spin_lock_irqsave(&irq_controller_lock, flags);
         p = &desc->action;
         if ((old = *p) != NULL) {
-                /* Can't share interrupts unless both agree to */
-                if (!(old->flags & new->flags & SA_SHIRQ)) {
+                /*
+                 * Can't share interrupts unless both agree to and are
+                 * the same type.
+                 */
+                if (!(old->flags & new->flags & SA_SHIRQ) ||
+                    (~old->flags & new->flags) & SA_TRIGGER_MASK) {
                         spin_unlock_irqrestore(&irq_controller_lock, flags);
                         return -EBUSY;
                 }
@@ -705,6 +709,12 @@ int setup_irq(unsigned int irq, struct irqaction *new)
                 desc->running = 0;
                 desc->pending = 0;
                 desc->disable_depth = 1;
+
+                if (new->flags & SA_TRIGGER_MASK) {
+                        unsigned int type = new->flags & SA_TRIGGER_MASK;
+                        desc->chip->set_type(irq, type);
+                }
+
                 if (!desc->noautoenable) {
                         desc->disable_depth = 0;
                         desc->chip->unmask(irq);