summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2010-11-28 20:45:47 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2010-11-28 20:45:47 +0000
commit95785be3b32ea249860679fc6ece4723e1628be0 (patch)
treeef199255aef963f4c9abbe6af42f62b4400acd38
parent0f0195d7b04daffd0ab8f044ea5c01c854238bae (diff)
This file redefines the IRQdisable and IRQenable macros, but never uses them,
so why bother.
-rw-r--r--sys/arch/arm/arm/cpuswitch.S20
1 files changed, 1 insertions, 19 deletions
diff --git a/sys/arch/arm/arm/cpuswitch.S b/sys/arch/arm/arm/cpuswitch.S
index 39873cf7a1a..09d1b5e76c3 100644
--- a/sys/arch/arm/arm/cpuswitch.S
+++ b/sys/arch/arm/arm/cpuswitch.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpuswitch.S,v 1.10 2008/07/28 19:08:46 miod Exp $ */
+/* $OpenBSD: cpuswitch.S,v 1.11 2010/11/28 20:45:46 miod Exp $ */
/* $NetBSD: cpuswitch.S,v 1.41 2003/11/15 08:44:18 scw Exp $ */
/*
@@ -86,24 +86,6 @@
/* LINTSTUB: include <sys/param.h> */
-#undef IRQdisable
-#undef IRQenable
-
-/*
- * New experimental definitions of IRQdisable and IRQenable
- * These keep FIQ's enabled since FIQ's are special.
- */
-
-#define IRQdisable \
- mrs r14, cpsr ; \
- orr r14, r14, #(I32_bit) ; \
- msr cpsr_c, r14 ; \
-
-#define IRQenable \
- mrs r14, cpsr ; \
- bic r14, r14, #(I32_bit) ; \
- msr cpsr_c, r14 ; \
-
/*
* These are used for switching the translation table/DACR.
* Since the vector page can be invalid for a short time, we must