Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch Explicitly mention MP_TRAMPOLINE in these comments, ...



details:   https://anonhg.NetBSD.org/src/rev/cf7aaef84037
branches:  trunk
changeset: 815399:cf7aaef84037
user:      maxv <maxv%NetBSD.org@localhost>
date:      Sun May 15 10:35:54 2016 +0000

description:
Explicitly mention MP_TRAMPOLINE in these comments, so that NXR links them.

diffstat:

 sys/arch/amd64/amd64/machdep.c |   6 +++---
 sys/arch/i386/i386/machdep.c   |   8 ++++----
 sys/arch/x86/x86/pmap.c        |  14 +++++++-------
 3 files changed, 14 insertions(+), 14 deletions(-)

diffs (95 lines):

diff -r b709885c8093 -r cf7aaef84037 sys/arch/amd64/amd64/machdep.c
--- a/sys/arch/amd64/amd64/machdep.c    Sun May 15 07:17:53 2016 +0000
+++ b/sys/arch/amd64/amd64/machdep.c    Sun May 15 10:35:54 2016 +0000
@@ -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 @@
         * 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
diff -r b709885c8093 -r cf7aaef84037 sys/arch/i386/i386/machdep.c
--- a/sys/arch/i386/i386/machdep.c      Sun May 15 07:17:53 2016 +0000
+++ b/sys/arch/i386/i386/machdep.c      Sun May 15 10:35:54 2016 +0000
@@ -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 @@
         * 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
         */
diff -r b709885c8093 -r cf7aaef84037 sys/arch/x86/x86/pmap.c
--- a/sys/arch/x86/x86/pmap.c   Sun May 15 07:17:53 2016 +0000
+++ b/sys/arch/x86/x86/pmap.c   Sun May 15 10:35:54 2016 +0000
@@ -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 @@
 {
        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) {



Home | Main Index | Thread Index | Old Index