debranch SMP, have fun

2 files changed, 4 insertions, 20 deletions

diff --git a/sys/arch/amd64/include/cpu.h b/sys/arch/amd64/include/cpu.h
index cc688f39aa6..9caf05b561d 100644
--- a/sys/arch/amd64/include/cpu.h
+++ b/sys/arch/amd64/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.6 2004/03/09 23:05:13 deraadt Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.7 2004/06/13 21:49:13 niklas Exp $	*/
 /*	$NetBSD: cpu.h,v 1.1 2003/04/26 18:39:39 fvdl Exp $	*/
 
 /*-
@@ -191,25 +191,15 @@ extern struct cpu_info cpu_info_primary;
  * or after the current trap/syscall if in system mode.
  */
 
-#ifdef MULTIPROCESSOR
 #define need_resched(ci)						\
 do {									\
-	struct cpu_info *__ci = (ci);					\
+	struct cpu_info *__ci = curcpu();					\
 	__ci->ci_want_resched = 1;					\
 	if (__ci->ci_curproc != NULL)					\
 		aston(__ci->ci_curproc);				\
 } while (/*CONSTCOND*/0)
-#else
-#define need_resched()							\
-do {									\
-	struct cpu_info *__ci = curcpu();				\
-	__ci->ci_want_resched = 1;					\
-	if (__ci->ci_curproc != NULL)					\
-		aston(__ci->ci_curproc);				\
-} while (/*CONSTCOND*/0)
-#endif
 
-#endif
+#endif	/* MULTIPROCESSOR */
 
 #define aston(p)	((p)->p_md.md_astpending = 1)
 
diff --git a/sys/arch/amd64/include/param.h b/sys/arch/amd64/include/param.h
index ea59b9e5273..09e070357a6 100644
--- a/sys/arch/amd64/include/param.h
+++ b/sys/arch/amd64/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.3 2004/04/19 22:55:48 deraadt Exp $	*/
+/*	$OpenBSD: param.h,v 1.4 2004/06/13 21:49:13 niklas Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -162,9 +162,3 @@
 #define btop(x)				x86_btop(x)
 #define ptob(x)				x86_ptob(x)
 #define round_pdr(x)			x86_round_pdr(x)
-
-/* XXX - oh, the horror.. Just for now. */
-#define KERNEL_PROC_LOCK(p)
-#define KERNEL_PROC_UNLOCK(p)
-#define KERNEL_LOCK(i)
-#define KERNEL_UNLOCK()