diff -Napur -X /home/jbarnes/dontdiff ../kernel-2.6.11/linux-2.6.11/arch/ia64/kernel/irq.c linux-2.6.11/arch/ia64/kernel/irq.c
--- ../kernel-2.6.11/linux-2.6.11/arch/ia64/kernel/irq.c	2005-03-01 23:38:25.000000000 -0800
+++ linux-2.6.11/arch/ia64/kernel/irq.c	2005-03-14 11:08:09.000000000 -0800
@@ -97,7 +97,9 @@ skip:
 cpumask_t __cacheline_aligned pending_irq_cpumask[NR_IRQS];
 static unsigned long pending_irq_redir[BITS_TO_LONGS(NR_IRQS)];
 
+#ifndef CONFIG_GENERIC_HARDIRQS
 static cpumask_t irq_affinity [NR_IRQS] = { [0 ... NR_IRQS-1] = CPU_MASK_ALL };
+#endif
 static char irq_redir [NR_IRQS]; // = { [0 ... NR_IRQS-1] = 1 };
 
 void set_irq_affinity_info (unsigned int irq, int hwid, int redir)
diff -Napur -X /home/jbarnes/dontdiff ../kernel-2.6.11/linux-2.6.11/drivers/serial/sn_console.c linux-2.6.11/drivers/serial/sn_console.c
--- ../kernel-2.6.11/linux-2.6.11/drivers/serial/sn_console.c	2005-03-01 23:38:08.000000000 -0800
+++ linux-2.6.11/drivers/serial/sn_console.c	2005-03-14 11:01:02.000000000 -0800
@@ -799,7 +799,7 @@ static struct console sal_console = {
 
 #define SAL_CONSOLE	&sal_console
 
-static struct uart_driver sal_console_uart = {
+struct uart_driver sal_console_uart = {
 	.owner = THIS_MODULE,
 	.driver_name = "sn_console",
 	.dev_name = DEVICE_NAME,