patch-2.2.15 linux/arch/alpha/kernel/sys_nautilus.c

• Lines: 29
• Date: Fri Apr 21 12:45:44 2000
• Orig file: v2.2.14/arch/alpha/kernel/sys_nautilus.c
• Orig date: Tue Jan 4 21:18:39 2000

diff -u --new-file --recursive --exclude-from ../../exclude v2.2.14/arch/alpha/kernel/sys_nautilus.c linux/arch/alpha/kernel/sys_nautilus.c
@@ -30,6 +30,7 @@
 #include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/reboot.h>
+#include <linux/mc146818rtc.h>
 
 #include <asm/ptrace.h>
 #include <asm/system.h>
@@ -68,6 +69,11 @@
 {
 	STANDARD_INIT_IRQ_PROLOG;
 
+	if (alpha_using_srm) {
+		alpha_mv.device_interrupt = srm_device_interrupt;
+		alpha_mv.kill_arch = generic_kill_arch;
+	}
+
 	enable_irq(2);			/* enable cascade */
 	disable_irq(8);
 }
@@ -110,7 +116,7 @@
 	case LINUX_REBOOT_CMD_RESTART:
 		{
 			int v;
-			irongate_hose_write_config_byte(0, 0x07<<3, 0x43, &v, 0);
+			irongate_hose_read_config_byte(0, 0x07<<3, 0x43, &v, 0);
 			irongate_hose_write_config_byte(0, 0x07<<3, 0x43, v | 0x80, 0);
 			outb(1, 0x92);
 			outb(0, 0x92);