diff options
| author | cognet <cognet@FreeBSD.org> | 2004-07-20 22:38:46 +0000 |
|---|---|---|
| committer | cognet <cognet@FreeBSD.org> | 2004-07-20 22:38:46 +0000 |
| commit | f6936a77a82c51169abd8fb14ada084d03432027 (patch) | |
| tree | f13ee5b9ba75da4f80d363424691e4c12a64c609 /sys/arm | |
| parent | 6cc5ed789d5d50e63119de71ef76af27214ceba9 (diff) | |
| download | FreeBSD-src-f6936a77a82c51169abd8fb14ada084d03432027.zip FreeBSD-src-f6936a77a82c51169abd8fb14ada084d03432027.tar.gz | |
Nuke disable_intr() and enable_intr(), as it already exists elsewhere.
Diffstat (limited to 'sys/arm')
| -rw-r--r-- | sys/arm/arm/support.S | 5 | ||||
| -rw-r--r-- | sys/arm/include/cpufunc.h | 4 | ||||
| -rw-r--r-- | sys/arm/include/profile.h | 4 |
3 files changed, 3 insertions, 10 deletions
diff --git a/sys/arm/arm/support.S b/sys/arm/arm/support.S index 504dbcc..9f8a1f2 100644 --- a/sys/arm/arm/support.S +++ b/sys/arm/arm/support.S @@ -65,11 +65,6 @@ ENTRY(casuptr) bic r14, r14, #(I32_bit) ; \ msr cpsr_all, r14 -ENTRY(disable_intr) - IRQdisableALL -ENTRY(enable_intr) - IRQenableALL - /* * memset: Sets a block of memory to the specified value * diff --git a/sys/arm/include/cpufunc.h b/sys/arm/include/cpufunc.h index 2199beb..f5de80a 100644 --- a/sys/arm/include/cpufunc.h +++ b/sys/arm/include/cpufunc.h @@ -50,13 +50,11 @@ #include <machine/cpuconf.h> #include <machine/katelib.h> /* For in[bwl] and out[bwl] */ -void disable_intr(void); -void enable_intr(void); - static __inline void breakpoint(void) { } + static __inline register_t intr_disable(void) { diff --git a/sys/arm/include/profile.h b/sys/arm/include/profile.h index 28faab5..efd3003 100644 --- a/sys/arm/include/profile.h +++ b/sys/arm/include/profile.h @@ -61,11 +61,11 @@ #define MCOUNT_DECL(s) u_long s; #ifdef SMP extern int mcount_lock; -#define MCOUNT_ENTER(s) { s = read_eflags(); disable_intr(); \ +#define MCOUNT_ENTER(s) { s = intr_disable(); \ while (!atomic_cmpset_acq_int(&mcount_lock, 0, 1)) \ /* nothing */ ; } #define MCOUNT_EXIT(s) { atomic_store_rel_int(&mcount_lock, 0); \ - write_eflags(s); } + intr_restore(s); } #else #define MCOUNT_ENTER(s) { s = read_eflags(); disable_intr(); } #define MCOUNT_EXIT(s) (write_eflags(s)) |
