patch-2.1.34 linux/include/asm-m68k/ide.h

• Lines: 26
• Date: Mon Apr 14 09:31:09 1997
• Orig file: v2.1.33/linux/include/asm-m68k/ide.h
• Orig date: Thu Mar 27 14:40:07 1997

diff -u --recursive --new-file v2.1.33/linux/include/asm-m68k/ide.h linux/include/asm-m68k/ide.h
@@ -479,7 +479,7 @@
 #ifdef CONFIG_ATARI
 	if (MACH_IS_ATARI) {
 		if (*ide_lock == 0) {
-			if (intr_count > 0)
+			if (in_interrupt() > 0)
 				panic( "Falcon IDE hasn't ST-DMA lock in interrupt" );
 			stdma_lock(handler, data);
 			*ide_lock = 1;
@@ -506,12 +506,12 @@
 #if defined(CONFIG_ATARI) && !defined(CONFIG_AMIGA)
 #define	ide_sti()					\
     do {						\
-	if (!intr_count) sti();				\
+	if (!in_interrupt()) sti();			\
     } while(0)
 #elif defined(CONFIG_ATARI)
-#define	ide_sti()					\
-    do {						\
-	if (!MACH_IS_ATARI || !intr_count) sti();	\
+#define	ide_sti()						\
+    do {							\
+	if (!MACH_IS_ATARI || !in_interrupt()) sti();		\
     } while(0)
 #else /* !defined(CONFIG_ATARI) */
 #define	ide_sti()	sti()