patch-2.3.48 linux/include/asm-mips/hardirq.h

• Lines: 43
• Date: Thu Feb 24 22:52:30 2000
• Orig file: v2.3.47/linux/include/asm-mips/hardirq.h
• Orig date: Tue Sep 7 12:14:07 1999

diff -u --recursive --new-file v2.3.47/linux/include/asm-mips/hardirq.h linux/include/asm-mips/hardirq.h
@@ -1,13 +1,14 @@
-/* $Id: hardirq.h,v 1.5 1998/08/29 21:20:21 ralf Exp $
+/* $Id: hardirq.h,v 1.7 2000/02/23 00:41:38 ralf Exp $
  *
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (C) 1997, 1998 by Ralf Baechle
+ * Copyright (C) 1997, 1998, 1999 by Ralf Baechle
+ * Copyright (C) 1999 Silicon Graphics, Inc.
  */
-#ifndef __ASM_MIPS_HARDIRQ_H
-#define __ASM_MIPS_HARDIRQ_H
+#ifndef _ASM_HARDIRQ_H
+#define _ASM_HARDIRQ_H
 
 #include <linux/threads.h>
 
@@ -19,14 +20,15 @@
  */
 #define in_interrupt() ({ int __cpu = smp_processor_id(); \
 	(local_irq_count[__cpu] + local_bh_count[__cpu] != 0); })
+#define in_irq() (local_irq_count[smp_processor_id()] != 0)
 
 #ifndef __SMP__
 
 #define hardirq_trylock(cpu)	(local_irq_count[cpu] == 0)
 #define hardirq_endlock(cpu)	do { } while (0)
 
-#define hardirq_enter(cpu)	(local_irq_count[cpu]++)
-#define hardirq_exit(cpu)	(local_irq_count[cpu]--)
+#define irq_enter(cpu)		(local_irq_count[cpu]++)
+#define irq_exit(cpu)		(local_irq_count[cpu]--)
 
 #define synchronize_irq()	barrier();
 
@@ -35,4 +37,4 @@
 #error No habla MIPS SMP
 
 #endif /* __SMP__ */
-#endif /* __ASM_MIPS_HARDIRQ_H */
+#endif /* _ASM_HARDIRQ_H */