ok?
Index: arch/alpha/include/cpu.h
===================================================================
RCS file: /cvs/src/sys/arch/alpha/include/cpu.h,v
retrieving revision 1.2
diff -u -p -r1.2 cpu.h
--- arch/alpha/include/cpu.h 26 Dec 2008 18:51:06 -0000 1.2
+++ arch/alpha/include/cpu.h 13 Aug 2009 08:47:04 -0000
@@ -1,4 +1,3 @@
-
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -243,7 +242,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()
/*
Index: arch/amd64/amd64/vm_machdep.c
===================================================================
RCS file: /cvs/src/sys/arch/amd64/amd64/vm_machdep.c,v
retrieving revision 1.2
diff -u -p -r1.2 vm_machdep.c
--- arch/amd64/amd64/vm_machdep.c 7 Jul 2009 17:25:32 -0000 1.2
+++ arch/amd64/amd64/vm_machdep.c 13 Aug 2009 08:47:04 -0000
@@ -1,4 +1,3 @@
-
/*-
* Copyright (c) 1995 Charles M. Hannum. All rights reserved.
* Copyright (c) 1982, 1986 The Regents of the University of California.
@@ -169,16 +168,6 @@ cpu_exit(struct proc *p)
pmap_deactivate(p);
tss_free(p->p_md.md_tss_sel);
sched_exit(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)
-{
}
/*
Index: arch/arm/include/cpu.h
===================================================================
RCS file: /cvs/src/sys/arch/arm/include/cpu.h,v
retrieving revision 1.2
diff -u -p -r1.2 cpu.h
--- arch/arm/include/cpu.h 26 Dec 2008 18:51:10 -0000 1.2
+++ arch/arm/include/cpu.h 13 Aug 2009 08:47:04 -0000
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 1994-1996 Mark Brinicombe.
* Copyright (c) 1994 Brini.
@@ -245,8 +244,6 @@ extern int astpending;
*/
#define signotify(p) setsoftast()
-
-#define cpu_wait(p) /* nothing */
/*
* Preempt the current process if in interrupt from user mode,
Index: arch/hp300/include/cpu.h
===================================================================
RCS file: /cvs/src/sys/arch/hp300/include/cpu.h,v
retrieving revision 1.2
diff -u -p -r1.2 cpu.h
--- arch/hp300/include/cpu.h 26 Dec 2008 18:51:11 -0000 1.2
+++ arch/hp300/include/cpu.h 13 Aug 2009 08:47:05 -0000
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 1988 University of Utah.
* Copyright (c) 1982, 1990, 1993
@@ -55,12 +54,6 @@
* Get interrupt glue.
*/
#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
Index: arch/hppa/hppa/vm_machdep.c
===================================================================
RCS file: /cvs/src/sys/arch/hppa/hppa/vm_machdep.c,v
retrieving revision 1.2
diff -u -p -r1.2 vm_machdep.c
--- arch/hppa/hppa/vm_machdep.c 26 Dec 2008 18:51:13 -0000 1.2
+++ arch/hppa/hppa/vm_machdep.c 13 Aug 2009 08:47:05 -0000
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 1999-2004 Michael Shalayeff
* All rights reserved.
@@ -188,12 +187,6 @@ cpu_exit(p)
pmap_deactivate(p);
sched_exit(p);
-}
-
-void
-cpu_wait(p)
- struct proc *p;
-{
}
/*
Index: arch/hppa64/hppa64/vm_machdep.c
===================================================================
RCS file: /cvs/src/sys/arch/hppa64/hppa64/vm_machdep.c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 vm_machdep.c
--- arch/hppa64/hppa64/vm_machdep.c 26 Aug 2008 14:41:11 -0000 1.1.1.1
+++ arch/hppa64/hppa64/vm_machdep.c 13 Aug 2009 08:47:05 -0000
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 2005 Michael Shalayeff
* All rights reserved.
@@ -182,12 +181,6 @@ cpu_exit(p)
pmap_deactivate(p);
sched_exit(p);
-}
-
-void
-cpu_wait(p)
- struct proc *p;
-{
}
/*
Index: arch/i386/i386/vm_machdep.c
===================================================================
RCS file: /cvs/src/sys/arch/i386/i386/vm_machdep.c,v
retrieving revision 1.2
diff -u -p -r1.2 vm_machdep.c
--- arch/i386/i386/vm_machdep.c 7 Jul 2009 17:25:32 -0000 1.2
+++ arch/i386/i386/vm_machdep.c 13 Aug 2009 08:47:05 -0000
@@ -1,4 +1,3 @@
-
/*-
* Copyright (c) 1995 Charles M. Hannum. All rights reserved.
* Copyright (c) 1982, 1986 The Regents of the University of California.
@@ -145,11 +144,6 @@ cpu_exit(struct proc *p)
pmap_deactivate(p);
tss_free(p->p_md.md_tss_sel);
sched_exit(p);
-}
-
-void
-cpu_wait(struct proc *p)
-{
}
/*
Index: arch/mac68k/include/cpu.h
===================================================================
RCS file: /cvs/src/sys/arch/mac68k/include/cpu.h,v
retrieving revision 1.2
diff -u -p -r1.2 cpu.h
--- arch/mac68k/include/cpu.h 26 Dec 2008 18:51:17 -0000 1.2
+++ arch/mac68k/include/cpu.h 13 Aug 2009 08:47:06 -0000
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 1988 University of Utah.
* Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -75,12 +74,6 @@
* Get interrupt glue.
*/
#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
Index: arch/mips64/include/cpu.h
===================================================================
RCS file: /cvs/src/sys/arch/mips64/include/cpu.h,v
retrieving revision 1.3
diff -u -p -r1.3 cpu.h
--- arch/mips64/include/cpu.h 18 Mar 2009 21:10:14 -0000 1.3
+++ arch/mips64/include/cpu.h 13 Aug 2009 08:47:06 -0000
@@ -1,4 +1,3 @@
-
/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -358,12 +357,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
Index: arch/powerpc/include/cpu.h
===================================================================
RCS file: /cvs/src/sys/arch/powerpc/include/cpu.h,v
retrieving revision 1.2
diff -u -p -r1.2 cpu.h
--- arch/powerpc/include/cpu.h 26 Dec 2008 18:51:19 -0000 1.2
+++ arch/powerpc/include/cpu.h 13 Aug 2009 08:47:06 -0000
@@ -1,4 +1,3 @@
-
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
* Copyright (C) 1995, 1996 TooLs GmbH.
@@ -131,8 +130,6 @@ extern struct cpu_info cpu_info[PPC_MAXP
* This is used during profiling to integrate system time.
*/
#define PROC_PC(p) (trapframe(p)->srr0)
-
-#define cpu_wait(p) do { /* nothing */ } while (0)
void delay(unsigned);
#define DELAY(n) delay(n)
Index: arch/sh/include/cpu.h
===================================================================
RCS file: /cvs/src/sys/arch/sh/include/cpu.h,v
retrieving revision 1.2
diff -u -p -r1.2 cpu.h
--- arch/sh/include/cpu.h 26 Dec 2008 18:51:21 -0000 1.2
+++ arch/sh/include/cpu.h 13 Aug 2009 08:47:06 -0000
@@ -1,4 +1,3 @@
-
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc. All rights reserved.
* Copyright (c) 1990 The Regents of the University of California.
@@ -118,7 +117,6 @@ do {
\
extern int want_resched; /* need_resched() was called */
-#define cpu_wait(p) ((void)(p))
/*
* We need a machine-independent name for this.
*/
Index: arch/sparc/include/cpu.h
===================================================================
RCS file: /cvs/src/sys/arch/sparc/include/cpu.h,v
retrieving revision 1.2
diff -u -p -r1.2 cpu.h
--- arch/sparc/include/cpu.h 26 Dec 2008 18:51:22 -0000 1.2
+++ arch/sparc/include/cpu.h 13 Aug 2009 08:47:06 -0000
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -69,12 +68,6 @@
#include <machine/reg.h>
#include <sparc/sparc/intreg.h>
#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
Index: arch/sparc64/include/cpu.h
===================================================================
RCS file: /cvs/src/sys/arch/sparc64/include/cpu.h,v
retrieving revision 1.2
diff -u -p -r1.2 cpu.h
--- arch/sparc64/include/cpu.h 26 Dec 2008 18:51:24 -0000 1.2
+++ arch/sparc64/include/cpu.h 13 Aug 2009 08:47:06 -0000
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -191,12 +190,6 @@ void smp_signotify(struct proc *);
for (cii = 0, ci = curcpu(); ci != NULL; ci = NULL)
#endif
-
-/*
- * definitions of cpu-dependent requirements
- * referenced in generic code
- */
-#define cpu_wait(p) /* nothing */
/*
* Arguments to hardclock, softclock and gatherstats encapsulate the
Index: arch/vax/include/cpu.h
===================================================================
RCS file: /cvs/src/sys/arch/vax/include/cpu.h,v
retrieving revision 1.2
diff -u -p -r1.2 cpu.h
--- arch/vax/include/cpu.h 26 Dec 2008 18:51:25 -0000 1.2
+++ arch/vax/include/cpu.h 13 Aug 2009 08:47:06 -0000
@@ -44,8 +44,6 @@
#include <machine/trap.h>
#include <machine/intr.h>
-#define cpu_wait(p)
-
#include <sys/sched.h>
struct cpu_info {
struct proc *ci_curproc;
Index: kern/kern_exit.c
===================================================================
RCS file: /cvs/src/sys/kern/kern_exit.c,v
retrieving revision 1.2
diff -u -p -r1.2 kern_exit.c
--- kern/kern_exit.c 26 Dec 2008 18:51:49 -0000 1.2
+++ kern/kern_exit.c 13 Aug 2009 08:47:06 -0000
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 1982, 1986, 1989, 1991, 1993
* The Regents of the University of California. All rights reserved.
@@ -398,14 +397,6 @@ reaper(void)
LIST_REMOVE(p, p_hash);
mtx_leave(&deadproc_mutex);
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.
Index: sys/proc.h
===================================================================
RCS file: /cvs/src/sys/sys/proc.h,v
retrieving revision 1.2
diff -u -p -r1.2 proc.h
--- sys/proc.h 30 Dec 2008 07:53:46 -0000 1.2
+++ sys/proc.h 13 Aug 2009 08:47:06 -0000
@@ -1,4 +1,3 @@
-
/*-
* Copyright (c) 1986, 1989, 1991, 1993
* The Regents of the University of California. All rights reserved.
@@ -428,9 +427,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 *);
