patch-2.3.26 linux/arch/ppc/amiga/config.c

Next file: linux/arch/ppc/common_defconfig
Previous file: linux/arch/ppc/amiga/cia.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.25/linux/arch/ppc/amiga/config.c linux/arch/ppc/amiga/config.c
@@ -461,6 +461,8 @@
 
 #define TICK_SIZE 10000
 
+extern unsigned char cia_get_irq_mask(unsigned int irq);
+
 /* This is always executed with interrupts disabled.  */
 static unsigned long amiga_gettimeoffset (void)
 {
@@ -481,7 +483,7 @@
 
 	if (ticks > jiffy_ticks / 2)
 		/* check for pending interrupt */
-		if (cia_set_irq(&ciab_base, 0) & CIA_ICR_TA)
+		if (cia_get_irq_mask(IRQ_AMIGA_CIAB) & CIA_ICR_TA)
 			offset = 10000;
 
 	ticks = jiffy_ticks - ticks;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)