summaryrefslogtreecommitdiff
path: root/sys/arch/arm/include/cpu.h
diff options
context:
space:
mode:
authormatt <matt@NetBSD.org>2008-01-06 03:11:42 +0000
committermatt <matt@NetBSD.org>2008-01-06 03:11:42 +0000
commit940cdbb35532bef4ec211d5f0bf024fe4c8db47f (patch)
treef020c9b6e7a230a0696d870922ca2c4f3f5df3ad /sys/arch/arm/include/cpu.h
parentace1262f405e98dcf34944d902bd6a4fdbf2f2fe (diff)
current_intr_depth is dead. Make sure we don't use it anymore.
Diffstat (limited to 'sys/arch/arm/include/cpu.h')
-rw-r--r--sys/arch/arm/include/cpu.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/arch/arm/include/cpu.h b/sys/arch/arm/include/cpu.h
index 0256f307e18..ae9ef11b9ac 100644
--- a/sys/arch/arm/include/cpu.h
+++ b/sys/arch/arm/include/cpu.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.48 2007/12/11 17:02:32 ad Exp $ */
+/* $NetBSD: cpu.h,v 1.49 2008/01/06 03:11:42 matt Exp $ */
/*
* Copyright (c) 1994-1996 Mark Brinicombe.
@@ -139,14 +139,13 @@ extern int cpu_do_powersave;
* CLKF_INTR: True if we took the interrupt from inside another
* interrupt handler.
*/
-extern int current_intr_depth;
#ifdef __PROG32
/* Hack to treat FPE time as interrupt time so we can measure it */
#define CLKF_INTR(frame) \
- ((current_intr_depth > 1) || \
+ ((curcpu()->ci_idepth > 1) || \
(frame->cf_if.if_spsr & PSR_MODE) == PSR_UND32_MODE)
#else
-#define CLKF_INTR(frame) (current_intr_depth > 1)
+#define CLKF_INTR(frame) (curcpu()->ci_idepth > 1)
#endif
/*