1 files changed, 13 insertions, 3 deletions

diff --git a/arch/ia64/kernel/irq_ia64.c b/arch/ia64/kernel/irq_ia64.c
index 5ba06ebe355b..4fe60c7a2e90 100644
--- a/arch/ia64/kernel/irq_ia64.c
+++ b/arch/ia64/kernel/irq_ia64.c
@@ -63,20 +63,30 @@ EXPORT_SYMBOL(isa_irq_to_vector_map);
 static unsigned long ia64_vector_mask[BITS_TO_LONGS(IA64_NUM_DEVICE_VECTORS)];
 
 int
-assign_irq_vector (int irq)
+assign_irq_vector_nopanic (int irq)
 {
         int pos, vector;
  again:
         pos = find_first_zero_bit(ia64_vector_mask, IA64_NUM_DEVICE_VECTORS);
         vector = IA64_FIRST_DEVICE_VECTOR + pos;
         if (vector > IA64_LAST_DEVICE_VECTOR)
-                /* XXX could look for sharable vectors instead of panic'ing... */
-                panic("assign_irq_vector: out of interrupt vectors!");
+                return -1;
         if (test_and_set_bit(pos, ia64_vector_mask))
                 goto again;
         return vector;
 }
 
+int
+assign_irq_vector (int irq)
+{
+        int vector = assign_irq_vector_nopanic(irq);
+
+        if (vector < 0)
+                panic("assign_irq_vector: out of interrupt vectors!");
+
+        return vector;
+}
+
 void
 free_irq_vector (int vector)
 {