patch-1.3.76 linux/arch/i386/kernel/time.c

Next file: linux/arch/i386/math-emu/reg_constant.c
Previous file: linux/arch/i386/kernel/smp.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.75/linux/arch/i386/kernel/time.c linux/arch/i386/kernel/time.c
@@ -27,6 +27,8 @@
 #include <linux/timex.h>
 #include <linux/config.h>
 
+extern int setup_x86_irq(int, struct irqaction *);
+
 /* Cycle counter value at the previous timer interrupt.. */
 static unsigned long long last_timer_cc = 0;
 static unsigned long long init_timer_cc = 0;
@@ -353,7 +355,7 @@
 	return mktime(year, mon, day, hour, min, sec);
 }
 
-struct irqaction irq0  = { timer_interrupt, 0, 0, "timer", NULL, NULL};
+static struct irqaction irq0  = { timer_interrupt, 0, 0, "timer", NULL, NULL};
 
 void time_init(void)
 {
@@ -374,5 +376,5 @@
 		irq0.handler = pentium_timer_interrupt;
 	}
 #endif
-	enable_irq(0);
+	setup_x86_irq(0, &irq0);
 }

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this