summaryrefslogtreecommitdiff
path: root/sys/arch/atari/include/cpu.h
diff options
context:
space:
mode:
authorad <ad@NetBSD.org>2007-02-09 21:55:00 +0000
committerad <ad@NetBSD.org>2007-02-09 21:55:00 +0000
commitb07ec3fc388a5aeae51e8871aa89eefea3ce1e53 (patch)
treec93d3b23a29f98ac0e26c9d43afb509219d0ea42 /sys/arch/atari/include/cpu.h
parent5c1aad3ad0b9d2403784bd52128e8e8399e22254 (diff)
Merge newlock2 to head.
Diffstat (limited to 'sys/arch/atari/include/cpu.h')
-rw-r--r--sys/arch/atari/include/cpu.h12
1 files changed, 7 insertions, 5 deletions
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)