Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 16 Dec 2009 18:44:43 +0000 (10:44 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 16 Dec 2009 18:44:43 +0000 (10:44 -0800)
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] implement early_io{re,un}map for ia64
  [IA64] Replace old style lock initializer
  [IA64] fix SBA IOMMU to handle allocation failure properly
  [IA64] Save I-resources to ia64_sal_os_state
  [IA64] preallocate IA64_IRQ_MOVE_VECTOR

1  2 
arch/ia64/kernel/irq_ia64.c

@@@ -260,7 -260,6 +260,6 @@@ void __setup_vector_irq(int cpu
  }
  
  #if defined(CONFIG_SMP) && (defined(CONFIG_IA64_GENERIC) || defined(CONFIG_IA64_DIG))
- #define IA64_IRQ_MOVE_VECTOR  IA64_DEF_FIRST_DEVICE_VECTOR
  
  static enum vector_domain_type {
        VECTOR_DOMAIN_NONE,
@@@ -345,7 -344,7 +344,7 @@@ static irqreturn_t smp_irq_move_cleanup
  
                desc = irq_desc + irq;
                cfg = irq_cfg + irq;
 -              spin_lock(&desc->lock);
 +              raw_spin_lock(&desc->lock);
                if (!cfg->move_cleanup_count)
                        goto unlock;
  
                spin_unlock_irqrestore(&vector_lock, flags);
                cfg->move_cleanup_count--;
        unlock:
 -              spin_unlock(&desc->lock);
 +              raw_spin_unlock(&desc->lock);
        }
        return IRQ_HANDLED;
  }
@@@ -659,11 -658,8 +658,8 @@@ init_IRQ (void
        register_percpu_irq(IA64_SPURIOUS_INT_VECTOR, NULL);
  #ifdef CONFIG_SMP
  #if defined(CONFIG_IA64_GENERIC) || defined(CONFIG_IA64_DIG)
-       if (vector_domain_type != VECTOR_DOMAIN_NONE) {
-               BUG_ON(IA64_FIRST_DEVICE_VECTOR != IA64_IRQ_MOVE_VECTOR);
-               IA64_FIRST_DEVICE_VECTOR++;
+       if (vector_domain_type != VECTOR_DOMAIN_NONE)
                register_percpu_irq(IA64_IRQ_MOVE_VECTOR, &irq_move_irqaction);
-       }
  #endif
  #endif
  #ifdef CONFIG_PERFMON