diff options
Diffstat (limited to 'sys/arm/include')
| -rw-r--r-- | sys/arm/include/critical.h | 54 | ||||
| -rw-r--r-- | sys/arm/include/proc.h | 3 |
2 files changed, 2 insertions, 55 deletions
diff --git a/sys/arm/include/critical.h b/sys/arm/include/critical.h deleted file mode 100644 index f9f0578..0000000 --- a/sys/arm/include/critical.h +++ /dev/null @@ -1,54 +0,0 @@ -/*- - * Copyright (c) 2002 Matthew Dillon. All Rights Reserved. - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS - * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE - * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * This file contains prototypes and high-level inlines related to - * machine-level critical function support: - * - * cpu_critical_enter() - inlined - * cpu_critical_exit() - inlined - * cpu_critical_fork_exit() - prototyped - * related support functions residing - * in <arch>/<arch>/critical.c - prototyped - * - * $FreeBSD$ - */ - -#ifndef MACHINE_CRITICAL_H -#define MACHINE_CRITICAL_H -void cpu_critical_fork_exit(void); -static __inline void -cpu_critical_enter(struct thread *td) -{ - td->td_md.md_savecrit = disable_interrupts(I32_bit | F32_bit); -} - -static __inline void -cpu_critical_exit(struct thread *td) -{ - restore_interrupts(td->td_md.md_savecrit); -} - -#endif diff --git a/sys/arm/include/proc.h b/sys/arm/include/proc.h index eb548cc..597c75c 100644 --- a/sys/arm/include/proc.h +++ b/sys/arm/include/proc.h @@ -46,7 +46,8 @@ struct md_utrap { }; struct mdthread { - register_t md_savecrit; + int md_spinlock_count; /* (k) */ + register_t md_saved_cspr; /* (k) */ int md_ptrace_instr; int md_ptrace_addr; void *md_tp; |
