diff -Naurp -X /home/jbarnes/dontdiff 060-sn-serial-medusa-fix.patch/drivers/char/sn_serial.c 070-sn-console-update.patch/drivers/char/sn_serial.c
--- 060-sn-serial-medusa-fix.patch/drivers/char/sn_serial.c	Tue Dec 30 15:13:00 2003
+++ 070-sn-console-update.patch/drivers/char/sn_serial.c	Tue Dec 30 15:13:04 2003
@@ -21,8 +21,9 @@
 #include <linux/sysrq.h>
 #include <linux/circ_buf.h>
 #include <linux/serial_reg.h>
+#include <asm/uaccess.h>
 #include <asm/sn/sn_sal.h>
-#include <asm/sn/pci/pciio.h>		/* this is needed for get_console_nasid */
+#include <asm/sn/pci/pciio.h>
 #include <asm/sn/simulator.h>
 #include <asm/sn/sn2/sn_private.h>
 
@@ -771,7 +772,7 @@ sn_sal_read_proc(char *page, char **star
 	off_t	begin = 0;
 
 	len += sprintf(page, "sn_serial: nasid:%d irq:%d tx:%d rx:%d\n",
-		       get_console_nasid(), sn_sal_irq,
+		       (int)ia64_sn_get_console_nasid(), sn_sal_irq,
 		       sn_total_tx_count, sn_total_rx_count);
 	*eof = 1;