Module Name: src
Committed By: matt
Date: Wed Jun 9 18:16:27 UTC 2010
Modified Files:
src/sys/arch/mips/mips [matt-nb5-mips64]: vm_machdep.c
Log Message:
only copy PK_32, left rest of p_flag along.
To generate a diff of this commit:
cvs rdiff -u -r1.121.6.1.2.15 -r1.121.6.1.2.16 \
src/sys/arch/mips/mips/vm_machdep.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/mips/mips/vm_machdep.c
diff -u src/sys/arch/mips/mips/vm_machdep.c:1.121.6.1.2.15 src/sys/arch/mips/mips/vm_machdep.c:1.121.6.1.2.16
--- src/sys/arch/mips/mips/vm_machdep.c:1.121.6.1.2.15 Wed Jun 9 14:20:00 2010
+++ src/sys/arch/mips/mips/vm_machdep.c Wed Jun 9 18:16:27 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.121.6.1.2.15 2010/06/09 14:20:00 matt Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.121.6.1.2.16 2010/06/09 18:16:27 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -80,7 +80,7 @@
#include "opt_coredump.h"
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.121.6.1.2.15 2010/06/09 14:20:00 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.121.6.1.2.16 2010/06/09 18:16:27 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -216,7 +216,7 @@
{
p2->p_md.md_abi = p1->p_md.md_abi;
#ifdef _LP64
- p2->p_flag = p1->p_flag & PK_32;
+ p2->p_flag |= p1->p_flag & PK_32;
#endif
}
