Merge master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6

8 files changed, 26 insertions, 35 deletions

diff --git a/arch/ia64/hp/sim/simeth.c b/arch/ia64/hp/sim/simeth.c
index ae84a1018a89..0639ec0ed015 100644
--- a/arch/ia64/hp/sim/simeth.c
+++ b/arch/ia64/hp/sim/simeth.c
@@ -191,7 +191,7 @@ simeth_probe1(void)
         unsigned char mac_addr[ETH_ALEN];
         struct simeth_local *local;
         struct net_device *dev;
-        int fd, i, err;
+        int fd, i, err, rc;
 
         /*
          * XXX Fix me
@@ -228,7 +228,9 @@ simeth_probe1(void)
                 return err;
         }
 
-        dev->irq = assign_irq_vector(AUTO_ASSIGN);
+        if ((rc = assign_irq_vector(AUTO_ASSIGN)) < 0)
+                panic("%s: out of interrupt vectors!\n", __FUNCTION__);
+        dev->irq = rc;
 
         /*
          * attach the interrupt in the simulator, this does enable interrupts
diff --git a/arch/ia64/hp/sim/simserial.c b/arch/ia64/hp/sim/simserial.c
index 7a8ae0f4b387..7dcb8582ae0d 100644
--- a/arch/ia64/hp/sim/simserial.c
+++ b/arch/ia64/hp/sim/simserial.c
@@ -982,7 +982,7 @@ static struct tty_operations hp_ops = {
 static int __init
 simrs_init (void)
 {
-        int                     i;
+        int                     i, rc;
         struct serial_state     *state;
 
         if (!ia64_platform_is("hpsim"))
@@ -1017,7 +1017,10 @@ simrs_init (void)
                 if (state->type == PORT_UNKNOWN) continue;
 
                 if (!state->irq) {
-                        state->irq = assign_irq_vector(AUTO_ASSIGN);
+                        if ((rc = assign_irq_vector(AUTO_ASSIGN)) < 0)
+                                panic("%s: out of interrupt vectors!\n",
+                                      __FUNCTION__);
+                        state->irq = rc;
                         ia64_ssc_connect_irq(KEYBOARD_INTR, state->irq);
                 }
 
diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S
index 69f88d561d62..bb9a506deb78 100644
--- a/arch/ia64/kernel/entry.S
+++ b/arch/ia64/kernel/entry.S
@@ -1249,7 +1249,7 @@ ENTRY(sys_rt_sigreturn)
         stf.spill [r17]=f11
         adds out0=16,sp                         // out0 = &sigscratch
         br.call.sptk.many rp=ia64_rt_sigreturn
-.ret19: .restore sp 0
+.ret19: .restore sp,0
         adds sp=16,sp
         ;;
         ld8 r9=[sp]                             // load new ar.unat
diff --git a/arch/ia64/kernel/iosapic.c b/arch/ia64/kernel/iosapic.c
index c170be095ccd..7936b62f7a2e 100644
--- a/arch/ia64/kernel/iosapic.c
+++ b/arch/ia64/kernel/iosapic.c
@@ -489,8 +489,6 @@ static int iosapic_find_sharable_vector (unsigned long trigger, unsigned long po
                         }
                 }
         }
-        if (vector < 0)
-                panic("%s: out of interrupt vectors!\n", __FUNCTION__);
 
         return vector;
 }
@@ -506,6 +504,8 @@ iosapic_reassign_vector (int vector)
 
         if (!list_empty(&iosapic_intr_info[vector].rtes)) {
                 new_vector = assign_irq_vector(AUTO_ASSIGN);
+                if (new_vector < 0)
+                        panic("%s: out of interrupt vectors!\n", __FUNCTION__);
                 printk(KERN_INFO "Reassigning vector %d to %d\n", vector, new_vector);
                 memcpy(&iosapic_intr_info[new_vector], &iosapic_intr_info[vector],
                        sizeof(struct iosapic_intr_info));
@@ -734,9 +734,12 @@ again:
         spin_unlock_irqrestore(&iosapic_lock, flags);
 
         /* If vector is running out, we try to find a sharable vector */
-        vector = assign_irq_vector_nopanic(AUTO_ASSIGN);
-        if (vector < 0)
+        vector = assign_irq_vector(AUTO_ASSIGN);
+        if (vector < 0) {
                 vector = iosapic_find_sharable_vector(trigger, polarity);
+                if (vector < 0)
+                        panic("%s: out of interrupt vectors!\n", __FUNCTION__);
+        }
 
         spin_lock_irqsave(&irq_descp(vector)->lock, flags);
         spin_lock(&iosapic_lock);
@@ -884,6 +887,8 @@ iosapic_register_platform_intr (u32 int_type, unsigned int gsi,
                 break;
               case ACPI_INTERRUPT_INIT:
                 vector = assign_irq_vector(AUTO_ASSIGN);
+                if (vector < 0)
+                        panic("%s: out of interrupt vectors!\n", __FUNCTION__);
                 delivery = IOSAPIC_INIT;
                 break;
               case ACPI_INTERRUPT_CPEI:
diff --git a/arch/ia64/kernel/irq_ia64.c b/arch/ia64/kernel/irq_ia64.c
index 4fe60c7a2e90..6c4d59fd0364 100644
--- a/arch/ia64/kernel/irq_ia64.c
+++ b/arch/ia64/kernel/irq_ia64.c
@@ -63,30 +63,19 @@ EXPORT_SYMBOL(isa_irq_to_vector_map);
 static unsigned long ia64_vector_mask[BITS_TO_LONGS(IA64_NUM_DEVICE_VECTORS)];
 
 int
-assign_irq_vector_nopanic (int irq)
+assign_irq_vector (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)
-                return -1;
+                return -ENOSPC;
         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)
 {
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c
index 6407bff6bfd7..b8ebb8e427ef 100644
--- a/arch/ia64/kernel/perfmon.c
+++ b/arch/ia64/kernel/perfmon.c
@@ -37,7 +37,6 @@
 #include <linux/vfs.h>
 #include <linux/pagemap.h>
 #include <linux/mount.h>
-#include <linux/version.h>
 #include <linux/bitops.h>
 
 #include <asm/errno.h>
diff --git a/arch/ia64/sn/kernel/tiocx.c b/arch/ia64/sn/kernel/tiocx.c
index c1cbcd1a1398..254fe15c064b 100644
--- a/arch/ia64/sn/kernel/tiocx.c
+++ b/arch/ia64/sn/kernel/tiocx.c
@@ -8,7 +8,6 @@
 
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/version.h>
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/proc_fs.h>
diff --git a/arch/ia64/sn/kernel/xpc_main.c b/arch/ia64/sn/kernel/xpc_main.c
index 177ddb748ebe..d580adcad927 100644
--- a/arch/ia64/sn/kernel/xpc_main.c
+++ b/arch/ia64/sn/kernel/xpc_main.c
@@ -53,6 +53,7 @@
 #include <linux/cache.h>
 #include <linux/interrupt.h>
 #include <linux/slab.h>
+#include <linux/delay.h>
 #include <asm/sn/intr.h>
 #include <asm/sn/sn_sal.h>
 #include <asm/uaccess.h>
@@ -308,8 +309,7 @@ xpc_make_first_contact(struct xpc_partition *part)
                         "partition %d\n", XPC_PARTID(part));
 
                 /* wait a 1/4 of a second or so */
-                set_current_state(TASK_INTERRUPTIBLE);
-                (void) schedule_timeout(0.25 * HZ);
+                msleep_interruptible(250);
 
                 if (part->act_state == XPC_P_DEACTIVATING) {
                         return part->reason;
@@ -841,9 +841,7 @@ xpc_do_exit(void)
         down(&xpc_discovery_exited);
 
 
-        set_current_state(TASK_INTERRUPTIBLE);
-        schedule_timeout(0.3 * HZ);
-        set_current_state(TASK_RUNNING);
+        msleep_interruptible(300);
 
 
         /* wait for all partitions to become inactive */
@@ -860,12 +858,8 @@ xpc_do_exit(void)
                         }
                 }
 
-                if (active_part_count) {
-                        set_current_state(TASK_INTERRUPTIBLE);
-                        schedule_timeout(0.3 * HZ);
-                        set_current_state(TASK_RUNNING);
-                }
-
+                if (active_part_count)
+                        msleep_interruptible(300);
         } while (active_part_count > 0);