Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13888
Modified Files:
time.c
Log Message:
- Set a NICR value, but only if requested.
Index: time.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/time.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- time.c 30 Sep 2004 20:50:50 -0000 1.17
+++ time.c 4 Oct 2004 06:50:31 -0000 1.18
@@ -29,6 +29,7 @@
#include <asm/irq.h>
#include <asm/mtpr.h>
#include <asm/clock.h>
+#include <asm/mv.h>
#include <linux/mc146818rtc.h>
u64 jiffies_64;
@@ -72,7 +73,8 @@
* overflow while this value is incremented at a 1µs interval)
* to get more than one interrupt per hour:-)
*/
- __mtpr (0xffffffff - 1000000/HZ, PR_NICR);
+ if (mv->nicr_required)
+ __mtpr(0xffffffff - 1000000/HZ, PR_NICR);
/* Set the clock ticking and enable clock interrupts */
__mtpr(ICCS_ERROR | ICCS_INTERRUPT | /* clear error and interrupt bits */
|
