2 files changed, 9 insertions, 10 deletions

diff --git a/arch/alpha/kernel/irq.c b/arch/alpha/kernel/irq.c
index facf82a5499a..c626a821cdcb 100644
--- a/arch/alpha/kernel/irq.c
+++ b/arch/alpha/kernel/irq.c
@@ -42,8 +42,7 @@ void ack_bad_irq(unsigned int irq)
 #ifdef CONFIG_SMP 
 static char irq_user_affinity[NR_IRQS];
 
-int
-select_smp_affinity(unsigned int irq)
+int irq_select_affinity(unsigned int irq)
 {
         static int last_cpu;
         int cpu = last_cpu + 1;
@@ -51,7 +50,7 @@ select_smp_affinity(unsigned int irq)
         if (!irq_desc[irq].chip->set_affinity || irq_user_affinity[irq])
                 return 1;
 
-        while (!cpu_possible(cpu))
+        while (!cpu_possible(cpu) || !cpu_isset(cpu, irq_default_affinity))
                 cpu = (cpu < (NR_CPUS-1) ? cpu + 1 : 0);
         last_cpu = cpu;
 
diff --git a/arch/alpha/kernel/vmlinux.lds.S b/arch/alpha/kernel/vmlinux.lds.S
index f13249be17c5..ef37fc1acaea 100644
--- a/arch/alpha/kernel/vmlinux.lds.S
+++ b/arch/alpha/kernel/vmlinux.lds.S
@@ -25,6 +25,13 @@ SECTIONS
         } :kernel
         _etext = .;     /* End of text section */
 
+        NOTES :kernel :note
+        .dummy : {
+                *(.dummy)
+        } :kernel
+
+        RODATA
+
         /* Exception table */
         . = ALIGN(16);
         __ex_table : {
@@ -33,13 +40,6 @@ SECTIONS
                 __stop___ex_table = .;
         }
 
-        NOTES :kernel :note
-        .dummy : {
-                *(.dummy)
-        } :kernel
-
-        RODATA
-
         /* Will be freed after init */
         . = ALIGN(PAGE_SIZE);
         /* Init code and data */