Module Name: src
Committed By: maxv
Date: Wed Jul 13 15:39:33 UTC 2016
Modified Files:
src/sys/arch/amd64/amd64: machdep.c
src/sys/arch/i386/i386: machdep.c
Log Message:
Remove msgbuf_paddr.
To generate a diff of this commit:
cvs rdiff -u -r1.221 -r1.222 src/sys/arch/amd64/amd64/machdep.c
cvs rdiff -u -r1.756 -r1.757 src/sys/arch/i386/i386/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/amd64/amd64/machdep.c
diff -u src/sys/arch/amd64/amd64/machdep.c:1.221 src/sys/arch/amd64/amd64/machdep.c:1.222
--- src/sys/arch/amd64/amd64/machdep.c:1.221 Wed Jul 13 15:35:56 2016
+++ src/sys/arch/amd64/amd64/machdep.c Wed Jul 13 15:39:33 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.221 2016/07/13 15:35:56 maxv Exp $ */
+/* $NetBSD: machdep.c,v 1.222 2016/07/13 15:39:33 maxv Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2000, 2006, 2007, 2008, 2011
@@ -111,7 +111,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.221 2016/07/13 15:35:56 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.222 2016/07/13 15:39:33 maxv Exp $");
/* #define XENDEBUG_LOW */
@@ -253,7 +253,6 @@ size_t dump_header_size;
size_t dump_totalbytesleft;
vaddr_t msgbuf_vaddr;
-paddr_t msgbuf_paddr;
struct {
paddr_t paddr;
@@ -352,7 +351,6 @@ cpu_startup(void)
if (msgbuf_vaddr == 0)
panic("failed to valloc msgbuf_vaddr");
- /* msgbuf_paddr was init'd in pmap */
for (y = 0, sz = 0; y < msgbuf_p_cnt; y++) {
for (x = 0; x < btoc(msgbuf_p_seg[y].sz); x++, sz += PAGE_SIZE)
pmap_kenter_pa((vaddr_t)msgbuf_vaddr + sz,
Index: src/sys/arch/i386/i386/machdep.c
diff -u src/sys/arch/i386/i386/machdep.c:1.756 src/sys/arch/i386/i386/machdep.c:1.757
--- src/sys/arch/i386/i386/machdep.c:1.756 Wed Jul 13 15:35:56 2016
+++ src/sys/arch/i386/i386/machdep.c Wed Jul 13 15:39:33 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.756 2016/07/13 15:35:56 maxv Exp $ */
+/* $NetBSD: machdep.c,v 1.757 2016/07/13 15:39:33 maxv Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2000, 2004, 2006, 2008, 2009
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.756 2016/07/13 15:35:56 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.757 2016/07/13 15:39:33 maxv Exp $");
#include "opt_beep.h"
#include "opt_compat_ibcs2.h"
@@ -433,7 +433,6 @@ cpu_startup(void)
if (msgbuf_vaddr == 0)
panic("failed to valloc msgbuf_vaddr");
- /* msgbuf_paddr was init'd in pmap */
for (y = 0, sz = 0; y < msgbuf_p_cnt; y++) {
for (x = 0; x < btoc(msgbuf_p_seg[y].sz); x++, sz += PAGE_SIZE)
pmap_kenter_pa((vaddr_t)msgbuf_vaddr + sz,