From 466d4f4337e5cbbc65819eea7aef0ce7a08c2a8b Mon Sep 17 00:00:00 2001 From: zrj Date: Tue, 19 Dec 2017 17:59:05 +0200 Subject: [PATCH] kernel/pc64: Adjust some references to already removed i386. While there, perform some whitespace fixes. No functional change. --- sys/Makefile | 2 +- sys/Makefile.modules | 2 +- sys/platform/pc64/include/clock.h | 3 +- sys/platform/pc64/include/ioctl_fd.h | 3 +- sys/platform/pc64/include/proc.h | 2 +- sys/platform/pc64/x86_64/autoconf.c | 8 ++--- sys/platform/pc64/x86_64/bios.c | 8 ++--- sys/platform/pc64/x86_64/machdep.c | 45 ++++++++++++++--------------- sys/platform/pc64/x86_64/swtch.s | 2 +- sys/platform/pc64/x86_64/vm_machdep.c | 4 +-- sys/platform/vkernel64/include/clock.h | 2 +- sys/platform/vkernel64/include/globaldata.h | 6 ++-- sys/platform/vkernel64/include/md_var.h | 8 ++--- sys/platform/vkernel64/x86_64/autoconf.c | 2 +- sys/platform/vkernel64/x86_64/cpu_regs.c | 5 ++-- sys/platform/vkernel64/x86_64/global.s | 1 - sys/platform/vkernel64/x86_64/locore.s | 2 -- sys/platform/vkernel64/x86_64/swtch.s | 2 +- sys/platform/vkernel64/x86_64/userldt.c | 2 -- sys/platform/vkernel64/x86_64/vm_machdep.c | 2 +- 20 files changed, 50 insertions(+), 61 deletions(-) diff --git a/sys/Makefile b/sys/Makefile index c4d7255d2a..f0bb239cdd 100644 --- a/sys/Makefile +++ b/sys/Makefile @@ -12,7 +12,7 @@ SUBDIR= boot SUBDIR+=${MODULES_OVERRIDE} .else SUBDIR+=bus crypto dev emulation gnu kern net netbt netproto vfs -.if defined(WANT_NETGRAPH7) +.if defined(WANT_NETGRAPH7) SUBDIR+=netgraph7 .else SUBDIR+=netgraph diff --git a/sys/Makefile.modules b/sys/Makefile.modules index dfada64604..afacc19c91 100644 --- a/sys/Makefile.modules +++ b/sys/Makefile.modules @@ -8,7 +8,7 @@ SUBDIR=${MODULES_OVERRIDE} SUBDIR=bus .endif SUBDIR+=crypto emulation dev gnu kern net netbt netproto vfs -.if defined(WANT_NETGRAPH7) +.if defined(WANT_NETGRAPH7) SUBDIR+=netgraph7 .else SUBDIR+=netgraph diff --git a/sys/platform/pc64/include/clock.h b/sys/platform/pc64/include/clock.h index 9cdc6a15fd..ae5149cdbc 100644 --- a/sys/platform/pc64/include/clock.h +++ b/sys/platform/pc64/include/clock.h @@ -4,7 +4,6 @@ * This file is in the public domain. * * $FreeBSD: src/sys/i386/include/clock.h,v 1.38.2.1 2002/11/02 04:41:50 iwasaki Exp $ - * $DragonFly: src/sys/platform/pc32/include/clock.h,v 1.9 2008/05/10 17:24:08 dillon Exp $ */ #ifndef _MACHINE_CLOCK_H_ @@ -34,7 +33,7 @@ typedef int64_t tsc_sclock_t; #ifdef _KERNEL /* - * i386 to clock driver interface. + * x86 to clock driver interface. * XXX large parts of the driver and its interface are misplaced. */ extern int adjkerntz; diff --git a/sys/platform/pc64/include/ioctl_fd.h b/sys/platform/pc64/include/ioctl_fd.h index 6a54c85daf..2312412909 100644 --- a/sys/platform/pc64/include/ioctl_fd.h +++ b/sys/platform/pc64/include/ioctl_fd.h @@ -25,7 +25,6 @@ * DAMAGE. * * $FreeBSD: src/sys/i386/include/ioctl_fd.h,v 1.13.2.1 2001/07/19 13:16:54 joerg Exp $ - * $DragonFly: src/sys/platform/pc64/include/ioctl_fd.h,v 1.1 2007/08/21 19:45:45 corecode Exp $ */ #ifndef _MACHINE_IOCTL_FD_H_ @@ -124,7 +123,7 @@ struct fdc_status { #define FDOPT_NOERRLOG 0x002 /* no "hard error" kernel log messages */ /* - * The following definitions duplicate those in sys/i386/isa/fdreg.h + * The following definitions duplicate those in sys/dev/disk/fd/fdreg.h * They are here since their values are to be used in the above * structure when formatting a floppy. For very obvious reasons, both * definitions must match ;-) diff --git a/sys/platform/pc64/include/proc.h b/sys/platform/pc64/include/proc.h index 096e3417b9..4bacb27ff8 100644 --- a/sys/platform/pc64/include/proc.h +++ b/sys/platform/pc64/include/proc.h @@ -36,7 +36,7 @@ #define _MACHINE_PROC_H_ /* - * Machine-dependent part of the proc structure for i386. It's a good idea + * Machine-dependent part of the proc structure for x86_64. It's a good idea * to only put pointers here since any machine-specific structures will also * required you to pull in a bunch of MD headers, which we don't want. */ diff --git a/sys/platform/pc64/x86_64/autoconf.c b/sys/platform/pc64/x86_64/autoconf.c index e74def6a1a..2cf76eed4c 100644 --- a/sys/platform/pc64/x86_64/autoconf.c +++ b/sys/platform/pc64/x86_64/autoconf.c @@ -137,7 +137,7 @@ configure(void *dummy) /* * This will configure all devices, generally starting with the - * nexus (i386/i386/nexus.c). The nexus ISA code explicitly + * nexus (pc64/x86_64/nexus.c). The nexus ISA code explicitly * dummies up the attach in order to delay legacy initialization * until after all other busses/subsystems have had a chance * at those resources. @@ -305,7 +305,7 @@ hwaddr_to_sockaddr(char *ev, struct sockaddr_dl *sa) } static int -decode_nfshandle(char *ev, u_char *fh) +decode_nfshandle(char *ev, u_char *fh) { u_char *cp; int len, val; @@ -378,7 +378,7 @@ pxe_setup_nfsdiskless(void) if ((sdl->sdl_type == ourdl.sdl_type) && (sdl->sdl_alen == ourdl.sdl_alen) && !bcmp(sdl->sdl_data + sdl->sdl_nlen, - ourdl.sdl_data + ourdl.sdl_nlen, + ourdl.sdl_data + ourdl.sdl_nlen, sdl->sdl_alen)) { strlcpy(nd->myif.ifra_name, ifp->if_xname, @@ -412,7 +412,7 @@ match_done: nd->root_saddr.sin_port = htons(NFS_PORT); /* - * A tftp-only loader may pass NFS path information without a + * A tftp-only loader may pass NFS path information without a * root handle. Generate a warning but continue configuring. */ if (decode_nfshandle("boot.nfsroot.nfshandle", &nd->root_fh[0]) == 0) { diff --git a/sys/platform/pc64/x86_64/bios.c b/sys/platform/pc64/x86_64/bios.c index 1bd9a0df8a..1d6abe78e2 100644 --- a/sys/platform/pc64/x86_64/bios.c +++ b/sys/platform/pc64/x86_64/bios.c @@ -28,7 +28,7 @@ */ /* - * Subset of the i386 bios support code. We cannot make bios16 nor bios32 + * Subset of the x86 bios support code. We cannot make bios16 nor bios32 * calls, so we can leave that out. However, searching for bios rom * signatures can be useful for locating tables, eg: powernow settings. */ @@ -49,7 +49,7 @@ * * Search some or all of the BIOS region for a signature string. * - * (start) Optional offset returned from this function + * (start) Optional offset returned from this function * (for searching for multiple matches), or NULL * to start the search from the base of the BIOS. * Note that this will be a _physical_ address in @@ -67,7 +67,7 @@ u_int32_t bios_sigsearch(u_int32_t start, u_char *sig, int siglen, int paralen, int sigofs) { u_char *sp, *end; - + /* compute the starting address */ if ((start >= BIOS_START) && (start <= (BIOS_START + BIOS_SIZE))) { sp = (char *)BIOS_PADDRTOVADDR(start); @@ -82,7 +82,7 @@ bios_sigsearch(u_int32_t start, u_char *sig, int siglen, int paralen, int sigofs /* loop searching */ while ((sp + sigofs + siglen) < end) { - + /* compare here */ if (!bcmp(sp + sigofs, sig, siglen)) { /* convert back to physical address */ diff --git a/sys/platform/pc64/x86_64/machdep.c b/sys/platform/pc64/x86_64/machdep.c index ca6ef03550..0e14e5d29e 100644 --- a/sys/platform/pc64/x86_64/machdep.c +++ b/sys/platform/pc64/x86_64/machdep.c @@ -865,7 +865,7 @@ sendsig(sig_t catcher, int sig, sigset_t *mask, u_long code) regs->tf_rip -= SZSIGCODE_EXTRA_BYTES; /* - * i386 abi specifies that the direction flag must be cleared + * x86 abi specifies that the direction flag must be cleared * on function entry */ regs->tf_rflags &= ~(PSL_T | PSL_D); @@ -1006,7 +1006,7 @@ sys_sigreturn(struct sigreturn_args *uap) */ if (!EFL_SECURE(rflags & ~PSL_RF, regs->tf_rflags & ~PSL_RF)) { kprintf("sigreturn: rflags = 0x%lx\n", (long)rflags); - return(EINVAL); + return(EINVAL); } /* @@ -1069,7 +1069,7 @@ cpu_halt(void) * * The main loop is entered with a critical section held, we must release * the critical section before doing anything else. lwkt_switch() will - * check for pending interrupts due to entering and exiting its own + * check for pending interrupts due to entering and exiting its own * critical section. * * NOTE: On an SMP system we rely on a scheduler IPI to wake a HLTed cpu up. @@ -1321,9 +1321,8 @@ exec_setregs(u_long entry, u_long stack, u_long ps_strings) struct pcb *pcb = td->td_pcb; struct trapframe *regs = lp->lwp_md.md_regs; - /* was i386_user_cleanup() in NetBSD */ user_ldt_free(pcb); - + clear_quickret(); bzero((char *)regs, sizeof(struct trapframe)); regs->tf_rip = entry; @@ -1375,7 +1374,7 @@ exec_setregs(u_long entry, u_long stack, u_long ps_strings) /* * NOTE: The MSR values must be correct so we can return to - * userland. gd_user_fs/gs must be correct so the switch + * userland. gd_user_fs/gs must be correct so the switch * code knows what the current MSR values are. */ pcb->pcb_fsbase = 0; /* Values loaded from PCB on switch */ @@ -1426,7 +1425,7 @@ SYSCTL_INT(_machdep, CPU_DISRTCSET, disable_rtc_set, CTLFLAG_RW, &disable_rtc_set, 0, ""); #if 0 /* JG */ -SYSCTL_STRUCT(_machdep, CPU_BOOTINFO, bootinfo, +SYSCTL_STRUCT(_machdep, CPU_BOOTINFO, bootinfo, CTLFLAG_RD, &bootinfo, bootinfo, ""); #endif @@ -1488,7 +1487,7 @@ struct soft_segment_descriptor gdt_segs[] = { 0, /* segment descriptor present */ 0, /* long */ 0, /* default 32 vs 16 bit size */ - 0 /* limit granularity (byte/page units)*/ }, + 0 /* limit granularity (byte/page units)*/ }, /* GCODE_SEL 1 Code Descriptor for kernel */ { 0x0, /* segment base address */ 0xfffff, /* length - all address space */ @@ -1497,7 +1496,7 @@ struct soft_segment_descriptor gdt_segs[] = { 1, /* segment descriptor present */ 1, /* long */ 0, /* default 32 vs 16 bit size */ - 1 /* limit granularity (byte/page units)*/ }, + 1 /* limit granularity (byte/page units)*/ }, /* GDATA_SEL 2 Data Descriptor for kernel */ { 0x0, /* segment base address */ 0xfffff, /* length - all address space */ @@ -1506,7 +1505,7 @@ struct soft_segment_descriptor gdt_segs[] = { 1, /* segment descriptor present */ 1, /* long */ 0, /* default 32 vs 16 bit size */ - 1 /* limit granularity (byte/page units)*/ }, + 1 /* limit granularity (byte/page units)*/ }, /* GUCODE32_SEL 3 32 bit Code Descriptor for user */ { 0x0, /* segment base address */ 0xfffff, /* length - all address space */ @@ -1515,7 +1514,7 @@ struct soft_segment_descriptor gdt_segs[] = { 1, /* segment descriptor present */ 0, /* long */ 1, /* default 32 vs 16 bit size */ - 1 /* limit granularity (byte/page units)*/ }, + 1 /* limit granularity (byte/page units)*/ }, /* GUDATA_SEL 4 32/64 bit Data Descriptor for user */ { 0x0, /* segment base address */ 0xfffff, /* length - all address space */ @@ -1524,7 +1523,7 @@ struct soft_segment_descriptor gdt_segs[] = { 1, /* segment descriptor present */ 0, /* long */ 1, /* default 32 vs 16 bit size */ - 1 /* limit granularity (byte/page units)*/ }, + 1 /* limit granularity (byte/page units)*/ }, /* GUCODE_SEL 5 64 bit Code Descriptor for user */ { 0x0, /* segment base address */ 0xfffff, /* length - all address space */ @@ -1533,7 +1532,7 @@ struct soft_segment_descriptor gdt_segs[] = { 1, /* segment descriptor present */ 1, /* long */ 0, /* default 32 vs 16 bit size */ - 1 /* limit granularity (byte/page units)*/ }, + 1 /* limit granularity (byte/page units)*/ }, /* GPROC0_SEL 6 Proc 0 Tss Descriptor */ { 0x0, /* segment base address */ @@ -1543,7 +1542,7 @@ struct soft_segment_descriptor gdt_segs[] = { 1, /* segment descriptor present */ 0, /* long */ 0, /* unused - default 32 vs 16 bit size */ - 0 /* limit granularity (byte/page units)*/ }, + 0 /* limit granularity (byte/page units)*/ }, /* Actually, the TSS is a system descriptor which is double size */ { 0x0, /* segment base address */ 0x0, /* length */ @@ -1552,7 +1551,7 @@ struct soft_segment_descriptor gdt_segs[] = { 0, /* segment descriptor present */ 0, /* long */ 0, /* default 32 vs 16 bit size */ - 0 /* limit granularity (byte/page units)*/ }, + 0 /* limit granularity (byte/page units)*/ }, /* GUGS32_SEL 8 32 bit GS Descriptor for user */ { 0x0, /* segment base address */ 0xfffff, /* length - all address space */ @@ -1561,7 +1560,7 @@ struct soft_segment_descriptor gdt_segs[] = { 1, /* segment descriptor present */ 0, /* long */ 1, /* default 32 vs 16 bit size */ - 1 /* limit granularity (byte/page units)*/ }, + 1 /* limit granularity (byte/page units)*/ }, }; void @@ -2414,7 +2413,7 @@ hammer_time(u_int64_t modulep, u_int64_t physfree) setidt_global(IDT_DE, &IDTVEC(div), SDT_SYSIGT, SEL_KPL, 0); setidt_global(IDT_DB, &IDTVEC(dbg), SDT_SYSIGT, SEL_KPL, 0); setidt_global(IDT_NMI, &IDTVEC(nmi), SDT_SYSIGT, SEL_KPL, 1); - setidt_global(IDT_BP, &IDTVEC(bpt), SDT_SYSIGT, SEL_UPL, 0); + setidt_global(IDT_BP, &IDTVEC(bpt), SDT_SYSIGT, SEL_UPL, 0); setidt_global(IDT_OF, &IDTVEC(ofl), SDT_SYSIGT, SEL_KPL, 0); setidt_global(IDT_BR, &IDTVEC(bnd), SDT_SYSIGT, SEL_KPL, 0); setidt_global(IDT_UD, &IDTVEC(ill), SDT_SYSIGT, SEL_KPL, 0); @@ -2604,9 +2603,9 @@ cpu_gdinit(struct mdglobaldata *gd, int cpu) if (cpu) gd->mi.gd_curthread = &gd->mi.gd_idlethread; - lwkt_init_thread(&gd->mi.gd_idlethread, - gd->mi.gd_prvspace->idlestack, - sizeof(gd->mi.gd_prvspace->idlestack), + lwkt_init_thread(&gd->mi.gd_idlethread, + gd->mi.gd_prvspace->idlestack, + sizeof(gd->mi.gd_prvspace->idlestack), 0, &gd->mi); lwkt_set_comm(&gd->mi.gd_idlethread, "idle_%d", cpu); gd->mi.gd_idlethread.td_switch = cpu_lwkt_switch; @@ -2821,11 +2820,11 @@ set_dbregs(struct lwp *lp, struct dbreg *dbregs) * carried to decide if it is safe and useful to * provide access to that capability */ - for (i = 0, mask1 = 0x3<<16, mask2 = 0x2<<16; i < 4; + for (i = 0, mask1 = 0x3<<16, mask2 = 0x2<<16; i < 4; i++, mask1 <<= 4, mask2 <<= 4) if ((dbregs->dr[7] & mask1) == mask2) return (EINVAL); - + pcb = lp->lwp_thread->td_pcb; ucred = lp->lwp_proc->p_ucred; @@ -2895,7 +2894,7 @@ user_dbreg_trap(void) int nbp; /* number of breakpoints that triggered */ caddr_t addr[4]; /* breakpoint addresses */ int i; - + dr7 = rdr7(); if ((dr7 & 0xff) == 0) { /* diff --git a/sys/platform/pc64/x86_64/swtch.s b/sys/platform/pc64/x86_64/swtch.s index 735348769a..a7781ef5eb 100644 --- a/sys/platform/pc64/x86_64/swtch.s +++ b/sys/platform/pc64/x86_64/swtch.s @@ -759,7 +759,7 @@ ENTRY(cpu_kthread_restore) * rax and rbx come from the switchout code. Call * lwkt_switch_return(otd). * - * NOTE: unlike i386, %rsi and %rdi are not call-saved regs. + * NOTE: unlike i386, the %rsi and %rdi are not call-saved regs. */ pushq %rax movq %rbx,%rdi diff --git a/sys/platform/pc64/x86_64/vm_machdep.c b/sys/platform/pc64/x86_64/vm_machdep.c index 85b16b749d..98d6395324 100644 --- a/sys/platform/pc64/x86_64/vm_machdep.c +++ b/sys/platform/pc64/x86_64/vm_machdep.c @@ -113,7 +113,7 @@ cpu_fork(struct lwp *lp1, struct lwp *lp2, int flags) /* Ensure that lp1's pcb is up to date. */ if (mdcpu->gd_npxthread == lp1->lwp_thread) npxsave(lp1->lwp_thread->td_savefpu); - + /* * Copy lp1's PCB. This really only applies to the * debug registers and FP state, but its faster to just copy the @@ -270,7 +270,7 @@ cpu_lwp_exit(void) pcb = td->td_pcb; - /* Some i386 functionality was dropped */ + /* Some x86 functionality was dropped */ KKASSERT(pcb->pcb_ext == NULL); /* diff --git a/sys/platform/vkernel64/include/clock.h b/sys/platform/vkernel64/include/clock.h index ed49bfbb7c..eb3d57e582 100644 --- a/sys/platform/vkernel64/include/clock.h +++ b/sys/platform/vkernel64/include/clock.h @@ -19,7 +19,7 @@ typedef uint64_t tsc_uclock_t; typedef int64_t tsc_sclock_t; /* - * i386 to clock driver interface. + * x86 to clock driver interface. * XXX large parts of the driver and its interface are misplaced. */ extern int adjkerntz; diff --git a/sys/platform/vkernel64/include/globaldata.h b/sys/platform/vkernel64/include/globaldata.h index ef680505e6..16fb1d3a77 100644 --- a/sys/platform/vkernel64/include/globaldata.h +++ b/sys/platform/vkernel64/include/globaldata.h @@ -45,7 +45,7 @@ #include /* vpte_t */ #endif #include /* struct segment_descriptor */ -#include /* struct i386tss */ +#include /* struct x86_64tss */ #include /* @@ -100,7 +100,7 @@ struct mdglobaldata { * takes 3 segments per cpu (12MB). */ #define PRIVATESPACE_SEGPAD \ - (SEG_SIZE - \ + (SEG_SIZE - \ ((sizeof(struct mdglobaldata) + MDGLOBALDATA_PAD + PAGE_SIZE * 4 + \ UPAGES * PAGE_SIZE) % SEG_SIZE)) \ @@ -112,7 +112,7 @@ struct privatespace { /* idle stack (UPAGES pages) */ char idlestack[UPAGES * PAGE_SIZE]; }; -#define mdcpu ((struct mdglobaldata *)_get_mycpu()) +#define mdcpu ((struct mdglobaldata *)_get_mycpu()) #endif diff --git a/sys/platform/vkernel64/include/md_var.h b/sys/platform/vkernel64/include/md_var.h index 4725922881..ecb57ac4f0 100644 --- a/sys/platform/vkernel64/include/md_var.h +++ b/sys/platform/vkernel64/include/md_var.h @@ -30,8 +30,6 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $DragonFly: src/sys/platform/vkernel/include/md_var.h,v 1.24 2008/03/20 02:14:54 dillon Exp $ */ #ifndef _MACHINE_MD_VAR_H_ @@ -79,9 +77,9 @@ extern vm_offset_t crashdumpmap; extern int cpu_fxsr; extern pthread_t ap_tids[MAXCPU]; -extern char cpu_vendor[]; /* XXX belongs in i386 */ -extern u_int cpu_vendor_id; /* XXX belongs in i386 */ -extern u_int cpu_id; /* XXX belongs in i386 */ +extern char cpu_vendor[]; /* XXX belongs in pc64 */ +extern u_int cpu_vendor_id; /* XXX belongs in pc64 */ +extern u_int cpu_id; /* XXX belongs in pc64 */ extern struct vkdisk_info DiskInfo[VKDISK_MAX]; extern int DiskNum; diff --git a/sys/platform/vkernel64/x86_64/autoconf.c b/sys/platform/vkernel64/x86_64/autoconf.c index 7a31650fa2..a73b54edec 100644 --- a/sys/platform/vkernel64/x86_64/autoconf.c +++ b/sys/platform/vkernel64/x86_64/autoconf.c @@ -210,7 +210,7 @@ configure(void *dummy) /* * This will configure all devices, generally starting with the - * nexus (i386/i386/nexus.c). The nexus ISA code explicitly + * nexus (pc64/x86_64/nexus.c). The nexus ISA code explicitly * dummies up the attach in order to delay legacy initialization * until after all other busses/subsystems have had a chance * at those resources. diff --git a/sys/platform/vkernel64/x86_64/cpu_regs.c b/sys/platform/vkernel64/x86_64/cpu_regs.c index 90f569695d..5ddc3fd6c1 100644 --- a/sys/platform/vkernel64/x86_64/cpu_regs.c +++ b/sys/platform/vkernel64/x86_64/cpu_regs.c @@ -283,7 +283,7 @@ sendsig(sig_t catcher, int sig, sigset_t *mask, u_long code) regs->tf_rip -= SZSIGCODE_EXTRA_BYTES; /* - * i386 abi specifies that the direction flag must be cleared + * x86 abi specifies that the direction flag must be cleared * on function entry */ regs->tf_rflags &= ~(PSL_T|PSL_D); @@ -556,7 +556,6 @@ exec_setregs(u_long entry, u_long stack, u_long ps_strings) struct pcb *pcb = td->td_pcb; struct trapframe *regs = lp->lwp_md.md_regs; - /* was i386_user_cleanup() in NetBSD */ user_ldt_free(pcb); bzero((char *)regs, sizeof(struct trapframe)); @@ -611,7 +610,7 @@ exec_setregs(u_long entry, u_long stack, u_long ps_strings) /* * NOTE: The MSR values must be correct so we can return to - * userland. gd_user_fs/gs must be correct so the switch + * userland. gd_user_fs/gs must be correct so the switch * code knows what the current MSR values are. */ pcb->pcb_fsbase = 0; /* Values loaded from PCB on switch */ diff --git a/sys/platform/vkernel64/x86_64/global.s b/sys/platform/vkernel64/x86_64/global.s index f240a868fd..d9dc6d3cb9 100644 --- a/sys/platform/vkernel64/x86_64/global.s +++ b/sys/platform/vkernel64/x86_64/global.s @@ -24,7 +24,6 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/i386/globals.s,v 1.13.2.1 2000/05/16 06:58:06 dillon Exp $ - * $DragonFly: src/sys/platform/vkernel/i386/global.s,v 1.2 2007/01/05 22:18:18 dillon Exp $ */ #include diff --git a/sys/platform/vkernel64/x86_64/locore.s b/sys/platform/vkernel64/x86_64/locore.s index 669f633c33..c3f5245897 100644 --- a/sys/platform/vkernel64/x86_64/locore.s +++ b/sys/platform/vkernel64/x86_64/locore.s @@ -30,8 +30,6 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $DragonFly: src/sys/platform/vkernel/i386/locore.s,v 1.6 2007/01/08 03:33:43 dillon Exp $ */ #include diff --git a/sys/platform/vkernel64/x86_64/swtch.s b/sys/platform/vkernel64/x86_64/swtch.s index 4a3c3e9c7a..017d7f9c3e 100644 --- a/sys/platform/vkernel64/x86_64/swtch.s +++ b/sys/platform/vkernel64/x86_64/swtch.s @@ -649,7 +649,7 @@ ENTRY(cpu_kthread_restore) * rax and rbx come from the switchout code. Call * lwkt_switch_return(otd). * - * NOTE: unlike i386, %rsi and %rdi are not call-saved regs. + * NOTE: unlike i386, the %rsi and %rdi are not call-saved regs. */ pushq %rax movq %rbx,%rdi diff --git a/sys/platform/vkernel64/x86_64/userldt.c b/sys/platform/vkernel64/x86_64/userldt.c index 0b9666587e..a22826346f 100644 --- a/sys/platform/vkernel64/x86_64/userldt.c +++ b/sys/platform/vkernel64/x86_64/userldt.c @@ -30,8 +30,6 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $DragonFly: src/sys/platform/vkernel/i386/userldt.c,v 1.2 2007/01/07 08:37:35 dillon Exp $ */ #include diff --git a/sys/platform/vkernel64/x86_64/vm_machdep.c b/sys/platform/vkernel64/x86_64/vm_machdep.c index 6827034cbb..818623bf86 100644 --- a/sys/platform/vkernel64/x86_64/vm_machdep.c +++ b/sys/platform/vkernel64/x86_64/vm_machdep.c @@ -259,7 +259,7 @@ cpu_lwp_exit(void) pcb = td->td_pcb; - /* Some i386 functionality was dropped */ + /* Some x86 functionality was dropped */ KKASSERT(pcb->pcb_ext == NULL); /* -- 2.11.4.GIT