patch-2.4.22 linux-2.4.22/include/asm-arm/system.h
Next file: linux-2.4.22/include/asm-arm/types.h
Previous file: linux-2.4.22/include/asm-arm/stat.h
Back to the patch index
Back to the overall index
- Lines: 54
- Date:
2003-08-25 04:44:43.000000000 -0700
- Orig file:
linux-2.4.21/include/asm-arm/system.h
- Orig date:
2003-06-13 07:51:38.000000000 -0700
diff -urN linux-2.4.21/include/asm-arm/system.h linux-2.4.22/include/asm-arm/system.h
@@ -22,6 +22,13 @@
#define have_isa_bridge (0)
#endif
+struct pt_regs;
+
+void die(const char *msg, struct pt_regs *regs, int err)
+ __attribute__((noreturn));
+
+void die_if_kernel(const char *str, struct pt_regs *regs, int err);
+
#include <asm/proc-fns.h>
#define xchg(ptr,x) \
@@ -59,11 +66,11 @@
} while (0)
/* For spinlocks etc */
-#define local_irq_save(x) __save_flags_cli(x)
-#define local_irq_set(x) __save_and_sti(x)
-#define local_irq_restore(x) __restore_flags(x)
-#define local_irq_disable() __cli()
-#define local_irq_enable() __sti()
+#define __save_flags_cli(x) local_irq_save(x)
+#define __save_flags(x) local_save_flags(x)
+#define __restore_flags(x) local_irq_restore(x)
+#define __cli() local_irq_disable()
+#define __sti() local_irq_enable()
#ifdef CONFIG_SMP
#error SMP not supported
@@ -78,15 +85,15 @@
#define smp_rmb() barrier()
#define smp_wmb() barrier()
-#define cli() __cli()
-#define sti() __sti()
+#define cli() local_irq_disable()
+#define sti() local_irq_enable()
#define clf() __clf()
#define stf() __stf()
-#define save_flags(x) __save_flags(x)
-#define restore_flags(x) __restore_flags(x)
-#define save_flags_cli(x) __save_flags_cli(x)
-#define save_and_cli(x) __save_flags_cli(x)
-#define save_and_sti(x) __save_flags_sti(x)
+#define save_flags(x) local_save_flags(x)
+#define restore_flags(x) local_irq_restore(x)
+#define save_flags_cli(x) local_irq_save(x)
+#define save_and_cli(x) local_irq_save(x)
+#define save_and_sti(x) local_irq_set(x)
#endif /* CONFIG_SMP */
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)