diff options
| author | ad <ad@NetBSD.org> | 2007-02-09 21:55:00 +0000 |
|---|---|---|
| committer | ad <ad@NetBSD.org> | 2007-02-09 21:55:00 +0000 |
| commit | b07ec3fc388a5aeae51e8871aa89eefea3ce1e53 (patch) | |
| tree | c93d3b23a29f98ac0e26c9d43afb509219d0ea42 /sys/arch/atari/include | |
| parent | 5c1aad3ad0b9d2403784bd52128e8e8399e22254 (diff) | |
Merge newlock2 to head.
Diffstat (limited to 'sys/arch/atari/include')
| -rw-r--r-- | sys/arch/atari/include/Makefile | 6 | ||||
| -rw-r--r-- | sys/arch/atari/include/cpu.h | 12 | ||||
| -rw-r--r-- | sys/arch/atari/include/mutex.h | 3 | ||||
| -rw-r--r-- | sys/arch/atari/include/rwlock.h | 3 |
4 files changed, 16 insertions, 8 deletions
diff --git a/sys/arch/atari/include/Makefile b/sys/arch/atari/include/Makefile index a9eb39d1e05..03293c9ab4a 100644 --- a/sys/arch/atari/include/Makefile +++ b/sys/arch/atari/include/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2006/07/26 19:54:56 drochner Exp $ +# $NetBSD: Makefile,v 1.24 2007/02/09 21:55:02 ad Exp $ INCSDIR= /usr/include/atari @@ -12,9 +12,9 @@ INCS= ahdilabel.h ansi.h aout_machdep.h asm.h \ int_const.h int_fmtio.h int_limits.h int_mwgwtypes.h int_types.h \ kcore.h \ limits.h lock.h \ - math.h mcontext.h msioctl.h mtpr.h \ + math.h mcontext.h msioctl.h mtpr.h mutex.h \ param.h pcb.h pmap.h pmc.h proc.h profile.h psl.h pte.h ptrace.h \ - reg.h \ + reg.h rwlock.h \ setjmp.h signal.h stdarg.h \ trap.h types.h \ varargs.h vmparam.h \ diff --git a/sys/arch/atari/include/cpu.h b/sys/arch/atari/include/cpu.h index 0e71da8d9c6..5723559c762 100644 --- a/sys/arch/atari/include/cpu.h +++ b/sys/arch/atari/include/cpu.h @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.48 2006/12/22 18:00:19 jdc Exp $ */ +/* $NetBSD: cpu.h,v 1.49 2007/02/09 21:55:02 ad Exp $ */ /* * Copyright (c) 1982, 1990 The Regents of the University of California. @@ -98,6 +98,8 @@ #include <sys/cpu_data.h> struct cpu_info { struct cpu_data ci_data; /* MI per-cpu data */ + int ci_mtx_count; + int ci_mtx_oldspl; }; extern struct cpu_info cpu_info_store; @@ -142,21 +144,21 @@ struct clockframe { * Preempt the current process if in interrupt from user mode, * or after the current trap/syscall if in system mode. */ -#define need_resched(ci) {want_resched = 1; setsoftast();} +#define cpu_need_resched(ci) {want_resched = 1; setsoftast();} /* * Give a profiling tick to the current process from the softclock * interrupt. On hp300, request an ast to send us through trap(), * marking the proc as needing a profiling tick. */ -#define profile_tick(p, framep) ((p)->p_flag |= P_OWEUPC, setsoftast()) -#define need_proftick(p) ((p)->p_flag |= P_OWEUPC, setsoftast()) +#define profile_tick(l, framep) ((l)->l_pflag |= LP_OWEUPC, setsoftast()) +#define cpu_need_proftick(l) ((l)->l_pflag |= LP_OWEUPC, setsoftast()) /* * Notify the current process (p) that it has a signal pending, * process as soon as possible. */ -#define signotify(p) setsoftast() +#define cpu_signotify(l) setsoftast() #define setsoftast() (astpending = 1) diff --git a/sys/arch/atari/include/mutex.h b/sys/arch/atari/include/mutex.h new file mode 100644 index 00000000000..3a7204284b4 --- /dev/null +++ b/sys/arch/atari/include/mutex.h @@ -0,0 +1,3 @@ +/* $NetBSD: mutex.h,v 1.2 2007/02/09 21:55:02 ad Exp $ */ + +#include <m68k/mutex.h> diff --git a/sys/arch/atari/include/rwlock.h b/sys/arch/atari/include/rwlock.h new file mode 100644 index 00000000000..6910f8b6fc4 --- /dev/null +++ b/sys/arch/atari/include/rwlock.h @@ -0,0 +1,3 @@ +/* $NetBSD: rwlock.h,v 1.2 2007/02/09 21:55:02 ad Exp $ */ + +#include <m68k/rwlock.h> |
