Module Name: src
Committed By: snj
Date: Fri Aug 14 21:30:19 UTC 2009
Modified Files:
src/sys/arch/hp300/include [netbsd-5]: cpu.h
src/sys/arch/news68k/include [netbsd-5]: cpu.h
src/sys/arch/powerpc/powerpc [netbsd-5]: trap.c
Log Message:
Pull up following revision(s) (requested by rmind in ticket #897):
sys/arch/hp300/include/cpu.h: revision 1.60
sys/arch/news68k/include/cpu.h: revision 1.34
sys/arch/powerpc/powerpc/trap.c: revision 1.130 via patch
Fix few more l_pflag and LP_OWEUPC confusions.
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.59.14.1 src/sys/arch/hp300/include/cpu.h
cvs rdiff -u -r1.33 -r1.33.14.1 src/sys/arch/news68k/include/cpu.h
cvs rdiff -u -r1.128 -r1.128.4.1 src/sys/arch/powerpc/powerpc/trap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hp300/include/cpu.h
diff -u src/sys/arch/hp300/include/cpu.h:1.59 src/sys/arch/hp300/include/cpu.h:1.59.14.1
--- src/sys/arch/hp300/include/cpu.h:1.59 Wed Feb 27 18:26:15 2008
+++ src/sys/arch/hp300/include/cpu.h Fri Aug 14 21:30:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.59 2008/02/27 18:26:15 xtraeme Exp $ */
+/* $NetBSD: cpu.h,v 1.59.14.1 2009/08/14 21:30:19 snj Exp $ */
/*
* Copyright (c) 1982, 1990, 1993
@@ -159,7 +159,7 @@
* through trap, marking the proc as needing a profiling tick.
*/
#define cpu_need_proftick(l) \
- do { (l)->l_flag |= LP_OWEUPC; aston(); } while (/* CONSTCOND */0)
+ do { (l)->l_pflag |= LP_OWEUPC; aston(); } while (/* CONSTCOND */0)
/*
* Notify the current process (p) that it has a signal pending,
Index: src/sys/arch/news68k/include/cpu.h
diff -u src/sys/arch/news68k/include/cpu.h:1.33 src/sys/arch/news68k/include/cpu.h:1.33.14.1
--- src/sys/arch/news68k/include/cpu.h:1.33 Wed Feb 27 18:26:16 2008
+++ src/sys/arch/news68k/include/cpu.h Fri Aug 14 21:30:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.33 2008/02/27 18:26:16 xtraeme Exp $ */
+/* $NetBSD: cpu.h,v 1.33.14.1 2009/08/14 21:30:19 snj Exp $ */
/*
* Copyright (c) 1982, 1990, 1993
@@ -174,7 +174,7 @@
* through trap, marking the proc as needing a profiling tick.
*/
#define cpu_need_proftick(l) \
- do { (l)->l_flag |= LP_OWEUPC; aston(); } while (/* CONSTCOND */0)
+ do { (l)->l_pflag |= LP_OWEUPC; aston(); } while (/* CONSTCOND */0)
/*
* Notify the current process (p) that it has a signal pending,
Index: src/sys/arch/powerpc/powerpc/trap.c
diff -u src/sys/arch/powerpc/powerpc/trap.c:1.128 src/sys/arch/powerpc/powerpc/trap.c:1.128.4.1
--- src/sys/arch/powerpc/powerpc/trap.c:1.128 Sat Oct 25 09:10:07 2008
+++ src/sys/arch/powerpc/powerpc/trap.c Fri Aug 14 21:30:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.128 2008/10/25 09:10:07 mrg Exp $ */
+/* $NetBSD: trap.c,v 1.128.4.1 2009/08/14 21:30:19 snj Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.128 2008/10/25 09:10:07 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.128.4.1 2009/08/14 21:30:19 snj Exp $");
#include "opt_altivec.h"
#include "opt_ddb.h"
@@ -342,7 +342,7 @@
ci->ci_astpending = 0; /* we are about to do it */
uvmexp.softs++;
if (l->l_pflag & LP_OWEUPC) {
- l->l_flag &= ~LP_OWEUPC;
+ l->l_pflag &= ~LP_OWEUPC;
ADDUPROF(p);
}
/* Check whether we are being preempted. */
