Module Name: src
Committed By: maxv
Date: Sun May 15 10:35:54 UTC 2016
Modified Files:
src/sys/arch/amd64/amd64: machdep.c
src/sys/arch/i386/i386: machdep.c
src/sys/arch/x86/x86: pmap.c
Log Message:
Explicitly mention MP_TRAMPOLINE in these comments, so that NXR links them.
To generate a diff of this commit:
cvs rdiff -u -r1.216 -r1.217 src/sys/arch/amd64/amd64/machdep.c
cvs rdiff -u -r1.754 -r1.755 src/sys/arch/i386/i386/machdep.c
cvs rdiff -u -r1.194 -r1.195 src/sys/arch/x86/x86/pmap.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.216 src/sys/arch/amd64/amd64/machdep.c:1.217
--- src/sys/arch/amd64/amd64/machdep.c:1.216 Thu May 12 06:45:16 2016
+++ src/sys/arch/amd64/amd64/machdep.c Sun May 15 10:35:54 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.216 2016/05/12 06:45:16 maxv Exp $ */
+/* $NetBSD: machdep.c,v 1.217 2016/05/15 10:35:54 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.216 2016/05/12 06:45:16 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.217 2016/05/15 10:35:54 maxv Exp $");
/* #define XENDEBUG_LOW */
@@ -1579,7 +1579,7 @@ init_x86_64(paddr_t first_avail)
* Low memory reservations:
* Page 0: BIOS data
* Page 1: BIOS callback (not used yet, for symmetry with i386)
- * Page 2: MP bootstrap
+ * Page 2: MP bootstrap code (MP_TRAMPOLINE)
* Page 3: ACPI wakeup code (ACPI_WAKEUP_ADDR)
* Page 4: Temporary page table for 0MB-4MB
* Page 5: Temporary page directory
Index: src/sys/arch/i386/i386/machdep.c
diff -u src/sys/arch/i386/i386/machdep.c:1.754 src/sys/arch/i386/i386/machdep.c:1.755
--- src/sys/arch/i386/i386/machdep.c:1.754 Fri Apr 24 00:04:04 2015
+++ src/sys/arch/i386/i386/machdep.c Sun May 15 10:35:54 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.754 2015/04/24 00:04:04 khorben Exp $ */
+/* $NetBSD: machdep.c,v 1.755 2016/05/15 10:35:54 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.754 2015/04/24 00:04:04 khorben Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.755 2016/05/15 10:35:54 maxv Exp $");
#include "opt_beep.h"
#include "opt_compat_ibcs2.h"
@@ -1197,8 +1197,8 @@ init386(paddr_t first_avail)
* Low memory reservations:
* Page 0: BIOS data
* Page 1: BIOS callback
- * Page 2: MP bootstrap
- * Page 3: ACPI wakeup code
+ * Page 2: MP bootstrap code (MP_TRAMPOLINE)
+ * Page 3: ACPI wakeup code (ACPI_WAKEUP_ADDR)
* Page 4: Temporary page table for 0MB-4MB
* Page 5: Temporary page directory
*/
Index: src/sys/arch/x86/x86/pmap.c
diff -u src/sys/arch/x86/x86/pmap.c:1.194 src/sys/arch/x86/x86/pmap.c:1.195
--- src/sys/arch/x86/x86/pmap.c:1.194 Sat May 14 09:37:21 2016
+++ src/sys/arch/x86/x86/pmap.c Sun May 15 10:35:54 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.194 2016/05/14 09:37:21 maxv Exp $ */
+/* $NetBSD: pmap.c,v 1.195 2016/05/15 10:35:54 maxv Exp $ */
/*-
* Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
@@ -171,7 +171,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.194 2016/05/14 09:37:21 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.195 2016/05/15 10:35:54 maxv Exp $");
#include "opt_user_ldt.h"
#include "opt_lockdebug.h"
@@ -4531,15 +4531,15 @@ pmap_init_tmp_pgtbl(paddr_t pg)
{
static bool maps_loaded;
static const paddr_t x86_tmp_pml_paddr[] = {
- 4 * PAGE_SIZE,
- 5 * PAGE_SIZE,
- 6 * PAGE_SIZE,
- 7 * PAGE_SIZE
+ 4 * PAGE_SIZE, /* L1 */
+ 5 * PAGE_SIZE, /* L2 */
+ 6 * PAGE_SIZE, /* L3 */
+ 7 * PAGE_SIZE /* L4 */
};
static vaddr_t x86_tmp_pml_vaddr[] = { 0, 0, 0, 0 };
pd_entry_t *tmp_pml, *kernel_pml;
-
+
int level;
if (!maps_loaded) {
