summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/arch/alpha/include/cpu.h3
-rw-r--r--sys/arch/amd64/amd64/vm_machdep.c12
-rw-r--r--sys/arch/arm/include/cpu.h4
-rw-r--r--sys/arch/hp300/include/cpu.h8
-rw-r--r--sys/arch/hppa/hppa/vm_machdep.c8
-rw-r--r--sys/arch/hppa64/hppa64/vm_machdep.c8
-rw-r--r--sys/arch/i386/i386/vm_machdep.c7
-rw-r--r--sys/arch/m88k/include/cpu.h3
-rw-r--r--sys/arch/mac68k/include/cpu.h8
-rw-r--r--sys/arch/mips64/include/cpu.h8
-rw-r--r--sys/arch/mvme68k/include/cpu.h8
-rw-r--r--sys/arch/powerpc/include/cpu.h4
-rw-r--r--sys/arch/sh/include/cpu.h3
-rw-r--r--sys/arch/sparc/include/cpu.h8
-rw-r--r--sys/arch/sparc64/include/cpu.h8
-rw-r--r--sys/arch/vax/include/cpu.h4
-rw-r--r--sys/kern/kern_exit.c10
-rw-r--r--sys/sys/proc.h5
18 files changed, 18 insertions, 101 deletions
diff --git a/sys/arch/alpha/include/cpu.h b/sys/arch/alpha/include/cpu.h
index 4b0c16725fb..3c6a8a0b6c8 100644
--- a/sys/arch/alpha/include/cpu.h
+++ b/sys/arch/alpha/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.37 2009/03/15 11:26:37 miod Exp $ */
+/* $OpenBSD: cpu.h,v 1.38 2009/03/26 17:24:32 oga Exp $ */
/* $NetBSD: cpu.h,v 1.45 2000/08/21 02:03:12 thorpej Exp $ */
/*-
@@ -250,7 +250,6 @@ extern struct cpu_info cpu_info_store;
* definitions of cpu-dependent requirements
* referenced in generic code
*/
-#define cpu_wait(p) /* nothing */
#define cpu_number() alpha_pal_whami()
/*
diff --git a/sys/arch/amd64/amd64/vm_machdep.c b/sys/arch/amd64/amd64/vm_machdep.c
index 144ecf99541..e392eda2f58 100644
--- a/sys/arch/amd64/amd64/vm_machdep.c
+++ b/sys/arch/amd64/amd64/vm_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vm_machdep.c,v 1.15 2009/02/03 11:24:19 mikeb Exp $ */
+/* $OpenBSD: vm_machdep.c,v 1.16 2009/03/26 17:24:33 oga Exp $ */
/* $NetBSD: vm_machdep.c,v 1.1 2003/04/26 18:39:33 fvdl Exp $ */
/*-
@@ -165,16 +165,6 @@ cpu_exit(struct proc *p)
}
/*
- * cpu_wait is called from reaper() to let machine-dependent
- * code free machine-dependent resources that couldn't be freed
- * in cpu_exit().
- */
-void
-cpu_wait(struct proc *p)
-{
-}
-
-/*
* Dump the machine specific segment at the start of a core dump.
*/
struct md_core {
diff --git a/sys/arch/arm/include/cpu.h b/sys/arch/arm/include/cpu.h
index c517b9c5268..c9475e0a234 100644
--- a/sys/arch/arm/include/cpu.h
+++ b/sys/arch/arm/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.23 2008/10/15 23:23:46 deraadt Exp $ */
+/* $OpenBSD: cpu.h,v 1.24 2009/03/26 17:24:33 oga Exp $ */
/* $NetBSD: cpu.h,v 1.34 2003/06/23 11:01:08 martin Exp $ */
/*
@@ -252,8 +252,6 @@ extern int astpending;
#define signotify(p) setsoftast()
-#define cpu_wait(p) /* nothing */
-
/*
* Preempt the current process if in interrupt from user mode,
* or after the current trap/syscall if in system mode.
diff --git a/sys/arch/hp300/include/cpu.h b/sys/arch/hp300/include/cpu.h
index a524d1cb618..b5d086daec4 100644
--- a/sys/arch/hp300/include/cpu.h
+++ b/sys/arch/hp300/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.36 2008/07/18 23:43:31 art Exp $ */
+/* $OpenBSD: cpu.h,v 1.37 2009/03/26 17:24:33 oga Exp $ */
/* $NetBSD: cpu.h,v 1.28 1998/02/13 07:41:51 scottr Exp $ */
/*
@@ -59,12 +59,6 @@
#include <machine/intr.h>
/*
- * definitions of cpu-dependent requirements
- * referenced in generic code
- */
-#define cpu_wait(p) /* nothing */
-
-/*
* Arguments to hardclock and gatherstats encapsulate the previous
* machine state in an opaque clockframe. One the hp300, we use
* what the hardware pushes on an interrupt (frame format 0).
diff --git a/sys/arch/hppa/hppa/vm_machdep.c b/sys/arch/hppa/hppa/vm_machdep.c
index ad8ce7fcd45..a6cd08cbc78 100644
--- a/sys/arch/hppa/hppa/vm_machdep.c
+++ b/sys/arch/hppa/hppa/vm_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vm_machdep.c,v 1.64 2008/09/30 18:54:26 miod Exp $ */
+/* $OpenBSD: vm_machdep.c,v 1.65 2009/03/26 17:24:33 oga Exp $ */
/*
* Copyright (c) 1999-2004 Michael Shalayeff
@@ -191,12 +191,6 @@ cpu_exit(p)
sched_exit(p);
}
-void
-cpu_wait(p)
- struct proc *p;
-{
-}
-
/*
* Map an IO request into kernel virtual address space.
*/
diff --git a/sys/arch/hppa64/hppa64/vm_machdep.c b/sys/arch/hppa64/hppa64/vm_machdep.c
index f5d8ab97727..ac7e46e0710 100644
--- a/sys/arch/hppa64/hppa64/vm_machdep.c
+++ b/sys/arch/hppa64/hppa64/vm_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vm_machdep.c,v 1.9 2008/09/30 18:54:27 miod Exp $ */
+/* $OpenBSD: vm_machdep.c,v 1.10 2009/03/26 17:24:33 oga Exp $ */
/*
* Copyright (c) 2005 Michael Shalayeff
@@ -185,12 +185,6 @@ cpu_exit(p)
sched_exit(p);
}
-void
-cpu_wait(p)
- struct proc *p;
-{
-}
-
/*
* Map an IO request into kernel virtual address space.
*/
diff --git a/sys/arch/i386/i386/vm_machdep.c b/sys/arch/i386/i386/vm_machdep.c
index c96575eb141..1d43864a04c 100644
--- a/sys/arch/i386/i386/vm_machdep.c
+++ b/sys/arch/i386/i386/vm_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vm_machdep.c,v 1.56 2009/02/03 11:24:19 mikeb Exp $ */
+/* $OpenBSD: vm_machdep.c,v 1.57 2009/03/26 17:24:33 oga Exp $ */
/* $NetBSD: vm_machdep.c,v 1.61 1996/05/03 19:42:35 christos Exp $ */
/*-
@@ -140,11 +140,6 @@ cpu_exit(struct proc *p)
sched_exit(p);
}
-void
-cpu_wait(struct proc *p)
-{
-}
-
/*
* Dump the machine specific segment at the start of a core dump.
*/
diff --git a/sys/arch/m88k/include/cpu.h b/sys/arch/m88k/include/cpu.h
index ba51c650a5a..8d894b8f784 100644
--- a/sys/arch/m88k/include/cpu.h
+++ b/sys/arch/m88k/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.46 2009/03/15 20:39:53 miod Exp $ */
+/* $OpenBSD: cpu.h,v 1.47 2009/03/26 17:24:33 oga Exp $ */
/*
* Copyright (c) 1996 Nivas Madhur
* Copyright (c) 1992, 1993
@@ -219,7 +219,6 @@ void set_cpu_number(cpuid_t);
* referenced in generic code
*/
#define cpu_exec(p) do { /* nothing */ } while (0)
-#define cpu_wait(p) do { /* nothing */ } while (0)
#define cpu_idle_enter() do { /* nothing */ } while (0)
#define cpu_idle_cycle() do { /* nothing */ } while (0)
diff --git a/sys/arch/mac68k/include/cpu.h b/sys/arch/mac68k/include/cpu.h
index 4ad125df84b..b16631c9e7d 100644
--- a/sys/arch/mac68k/include/cpu.h
+++ b/sys/arch/mac68k/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.47 2008/07/18 23:43:31 art Exp $ */
+/* $OpenBSD: cpu.h,v 1.48 2009/03/26 17:24:33 oga Exp $ */
/* $NetBSD: cpu.h,v 1.45 1997/02/10 22:13:40 scottr Exp $ */
/*
@@ -79,12 +79,6 @@
#include <machine/intr.h>
/*
- * definitions of cpu-dependent requirements
- * referenced in generic code
- */
-#define cpu_wait(p) /* nothing */
-
-/*
* Arguments to hardclock and gatherstats encapsulate the previous
* machine state in an opaque clockframe. One the hp300, we use
* what the hardware pushes on an interrupt (frame format 0).
diff --git a/sys/arch/mips64/include/cpu.h b/sys/arch/mips64/include/cpu.h
index fec803b246a..ae9f62855b8 100644
--- a/sys/arch/mips64/include/cpu.h
+++ b/sys/arch/mips64/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.29 2008/10/15 23:23:49 deraadt Exp $ */
+/* $OpenBSD: cpu.h,v 1.30 2009/03/26 17:24:33 oga Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -360,12 +360,6 @@ extern vaddr_t uncached_base;
* Exported definitions unique to mips cpu support.
*/
-/*
- * definitions of cpu-dependent requirements
- * referenced in generic code
- */
-#define cpu_wait(p) /* nothing */
-
#ifndef _LOCORE
#include <sys/sched.h>
diff --git a/sys/arch/mvme68k/include/cpu.h b/sys/arch/mvme68k/include/cpu.h
index 2a345c02c32..bed8a239d0f 100644
--- a/sys/arch/mvme68k/include/cpu.h
+++ b/sys/arch/mvme68k/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.31 2009/03/01 22:08:13 miod Exp $ */
+/* $OpenBSD: cpu.h,v 1.32 2009/03/26 17:24:33 oga Exp $ */
/*
* Copyright (c) 1995 Theo de Raadt
@@ -82,12 +82,6 @@
#include <machine/intr.h>
/*
- * definitions of cpu-dependent requirements
- * referenced in generic code
- */
-#define cpu_wait(p) /* nothing */
-
-/*
* Arguments to hardclock and gatherstats encapsulate the previous
* machine state in an opaque clockframe. One the m68k, we use
* what the hardware pushes on an interrupt (frame format 0).
diff --git a/sys/arch/powerpc/include/cpu.h b/sys/arch/powerpc/include/cpu.h
index 61a65501c97..9e86b6252d1 100644
--- a/sys/arch/powerpc/include/cpu.h
+++ b/sys/arch/powerpc/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.43 2009/03/15 20:07:14 miod Exp $ */
+/* $OpenBSD: cpu.h,v 1.44 2009/03/26 17:24:33 oga Exp $ */
/* $NetBSD: cpu.h,v 1.1 1996/09/30 16:34:21 ws Exp $ */
/*
@@ -147,8 +147,6 @@ extern struct cpu_info cpu_info[PPC_MAXPROCS];
*/
#define PROC_PC(p) (trapframe(p)->srr0)
-#define cpu_wait(p) do { /* nothing */ } while (0)
-
void delay(unsigned);
#define DELAY(n) delay(n)
diff --git a/sys/arch/sh/include/cpu.h b/sys/arch/sh/include/cpu.h
index 681b799c039..939af15b246 100644
--- a/sys/arch/sh/include/cpu.h
+++ b/sys/arch/sh/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.18 2008/10/15 23:23:49 deraadt Exp $ */
+/* $OpenBSD: cpu.h,v 1.19 2009/03/26 17:24:33 oga Exp $ */
/* $NetBSD: cpu.h,v 1.41 2006/01/21 04:24:12 uwe Exp $ */
/*-
@@ -124,7 +124,6 @@ do { \
extern int want_resched; /* need_resched() was called */
-#define cpu_wait(p) ((void)(p))
/*
* We need a machine-independent name for this.
*/
diff --git a/sys/arch/sparc/include/cpu.h b/sys/arch/sparc/include/cpu.h
index 5d44640212f..27dbcc663df 100644
--- a/sys/arch/sparc/include/cpu.h
+++ b/sys/arch/sparc/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.30 2008/07/18 23:43:31 art Exp $ */
+/* $OpenBSD: cpu.h,v 1.31 2009/03/26 17:24:33 oga Exp $ */
/* $NetBSD: cpu.h,v 1.24 1997/03/15 22:25:15 pk Exp $ */
/*
@@ -73,12 +73,6 @@
#include <sparc/sparc/cpuvar.h>
/*
- * definitions of cpu-dependent requirements
- * referenced in generic code
- */
-#define cpu_wait(p) /* nothing */
-
-/*
* Arguments to hardclock, softclock and gatherstats encapsulate the
* previous machine state in an opaque clockframe. The ipl is here
* as well for strayintr (see locore.s:interrupt and intr.c:strayintr).
diff --git a/sys/arch/sparc64/include/cpu.h b/sys/arch/sparc64/include/cpu.h
index 2bffa5dfa14..2ac13e33306 100644
--- a/sys/arch/sparc64/include/cpu.h
+++ b/sys/arch/sparc64/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.71 2009/01/23 19:16:39 kettenis Exp $ */
+/* $OpenBSD: cpu.h,v 1.72 2009/03/26 17:24:33 oga Exp $ */
/* $NetBSD: cpu.h,v 1.28 2001/06/14 22:56:58 thorpej Exp $ */
/*
@@ -202,12 +202,6 @@ void cpu_unidle(struct cpu_info *);
#endif
/*
- * definitions of cpu-dependent requirements
- * referenced in generic code
- */
-#define cpu_wait(p) /* nothing */
-
-/*
* Arguments to hardclock, softclock and gatherstats encapsulate the
* previous machine state in an opaque clockframe. The ipl is here
* as well for strayintr (see locore.s:interrupt and intr.c:strayintr).
diff --git a/sys/arch/vax/include/cpu.h b/sys/arch/vax/include/cpu.h
index d260460a2a3..82f9ee60f2b 100644
--- a/sys/arch/vax/include/cpu.h
+++ b/sys/arch/vax/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.34 2009/03/20 18:39:30 miod Exp $ */
+/* $OpenBSD: cpu.h,v 1.35 2009/03/26 17:24:33 oga Exp $ */
/* $NetBSD: cpu.h,v 1.41 1999/10/21 20:01:36 ragge Exp $ */
/*
@@ -47,8 +47,6 @@
#include <machine/trap.h>
#include <machine/intr.h>
-#define cpu_wait(p)
-
#include <sys/sched.h>
struct cpu_info {
struct proc *ci_curproc;
diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c
index 0677b9ea5dd..acb41b059d4 100644
--- a/sys/kern/kern_exit.c
+++ b/sys/kern/kern_exit.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_exit.c,v 1.82 2008/12/16 07:57:28 guenther Exp $ */
+/* $OpenBSD: kern_exit.c,v 1.83 2009/03/26 17:24:33 oga Exp $ */
/* $NetBSD: kern_exit.c,v 1.39 1996/04/22 01:38:25 christos Exp $ */
/*
@@ -400,14 +400,6 @@ reaper(void)
KERNEL_PROC_LOCK(curproc);
/*
- * Give machine-dependent code a chance to free any
- * resources it couldn't free while still running on
- * that process's context. This must be done before
- * uvm_exit(), in case these resources are in the PCB.
- */
- cpu_wait(p);
-
- /*
* Free the VM resources we're still holding on to.
* We must do this from a valid thread because doing
* so may block.
diff --git a/sys/sys/proc.h b/sys/sys/proc.h
index 8ecbabd2947..2031c6f1870 100644
--- a/sys/sys/proc.h
+++ b/sys/sys/proc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: proc.h,v 1.113 2009/03/23 13:25:11 art Exp $ */
+/* $OpenBSD: proc.h,v 1.114 2009/03/26 17:24:33 oga Exp $ */
/* $NetBSD: proc.h,v 1.44 1996/04/22 01:23:21 christos Exp $ */
/*-
@@ -435,9 +435,6 @@ void cpu_exit(struct proc *);
int fork1(struct proc *, int, int, void *, size_t, void (*)(void *),
void *, register_t *, struct proc **);
int groupmember(gid_t, struct ucred *);
-#if !defined(cpu_wait)
-void cpu_wait(struct proc *);
-#endif
void child_return(void *);
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-12 02:33:16 +0000