From 46007a41da1474a09566e81107d9581c7c972099 Mon Sep 17 00:00:00 2001
From: Peter Wemm <peter@FreeBSD.org>
Date: Fri, 24 Jun 2005 00:45:01 +0000
Subject: [PATCH] Various trivial comment fixes

Approved by: re
---
 sys/amd64/amd64/intr_machdep.c |  2 +-
 sys/amd64/amd64/local_apic.c   |  2 +-
 sys/amd64/amd64/machdep.c      |  2 +-
 sys/amd64/amd64/support.S      | 12 +++---------
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/sys/amd64/amd64/intr_machdep.c b/sys/amd64/amd64/intr_machdep.c
index a3d7933ec5fb..0e0ee9562188 100644
--- a/sys/amd64/amd64/intr_machdep.c
+++ b/sys/amd64/amd64/intr_machdep.c
@@ -30,7 +30,7 @@
  */
 
 /*
- * Machine dependent interrupt code for i386.  For the i386, we have to
+ * Machine dependent interrupt code for amd64.  For amd64, we have to
  * deal with different PICs.  Thus, we use the passed in vector to lookup
  * an interrupt source associated with that vector.  The interrupt source
  * describes which PIC the source belongs to and includes methods to handle
diff --git a/sys/amd64/amd64/local_apic.c b/sys/amd64/amd64/local_apic.c
index 6b2d762613d8..9ae15e9f5e40 100644
--- a/sys/amd64/amd64/local_apic.c
+++ b/sys/amd64/amd64/local_apic.c
@@ -839,7 +839,7 @@ SYSINIT(apic_setup_io, SI_SUB_INTR, SI_ORDER_SECOND, apic_setup_io, NULL)
 #ifdef SMP
 /*
  * Inter Processor Interrupt functions.  The lapic_ipi_*() functions are
- * private to the sys/i386 code.  The public interface for the rest of the
+ * private to the sys/amd64 code.  The public interface for the rest of the
  * kernel is defined in mp_machdep.c.
  */
 int
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index 4c9b4b03420c..e02725023bf0 100644
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -661,7 +661,7 @@ SYSCTL_INT(_machdep, CPU_WALLCLOCK, wall_cmos_clock,
 	CTLFLAG_RW, &wall_cmos_clock, 0, "");
 
 /*
- * Initialize 386 and configure to run kernel
+ * Initialize amd64 and configure to run kernel
  */
 
 /*
diff --git a/sys/amd64/amd64/support.S b/sys/amd64/amd64/support.S
index 3d4098e318d2..49ef65b0fcd3 100644
--- a/sys/amd64/amd64/support.S
+++ b/sys/amd64/amd64/support.S
@@ -201,14 +201,8 @@ ENTRY(fillw)
 /* copyout and fubyte family                                                 */
 /*****************************************************************************/
 /*
- * Access user memory from inside the kernel. These routines and possibly
- * the math- and DOS emulators should be the only places that do this.
- *
- * We have to access the memory with user's permissions, so use a segment
- * selector with RPL 3. For writes to user space we have to additionally
- * check the PTE for write permission, because the 386 does not check
- * write permissions when we are executing with EPL 0. The 486 does check
- * this if the WP bit is set in CR0, so we can use a simpler version here.
+ * Access user memory from inside the kernel. These routines should be
+ * the only places that do this.
  *
  * These routines set curpcb->onfault for the time they execute. When a
  * protection violation occurs inside the functions, the trap handler
@@ -592,7 +586,7 @@ ENTRY(copystr)
 	ret
 
 /*
- * Handling of special 386 registers and descriptor tables etc
+ * Handling of special amd64 registers and descriptor tables etc
  * %rdi
  */
 /* void lgdt(struct region_descriptor *rdp); */