patch-2.4.6 linux/include/asm-m68k/system.h

• Lines: 13
• Date: Mon Jun 11 19:15:27 2001
• Orig file: v2.4.5/linux/include/asm-m68k/system.h
• Orig date: Mon Nov 27 18:00:49 2000

diff -u --recursive --new-file v2.4.5/linux/include/asm-m68k/system.h linux/include/asm-m68k/system.h
@@ -52,9 +52,9 @@
 #define __sti() asm volatile ("andiw %0,%%sr": : "i" (ALLOWINT) : "memory")
 #else
 #include <asm/hardirq.h>
-#define __sti() ({								\
-	if (!local_irq_count(smp_processor_id()))				\
-		asm volatile ("andiw %0,%%sr": : "i" (ALLOWINT) : "memory");	\
+#define __sti() ({							      \
+	if (MACH_IS_Q40 || !local_irq_count(smp_processor_id()))              \
+		asm volatile ("andiw %0,%%sr": : "i" (ALLOWINT) : "memory");  \
 })
 #endif
 #define __cli() asm volatile ("oriw  #0x0700,%%sr": : : "memory")