Module Name: src
Committed By: uebayasi
Date: Sat Jun 22 13:09:08 UTC 2013
Modified Files:
src/sys/arch/amd64/amd64: mptramp.S
src/sys/arch/i386/i386: mptramp.S
Log Message:
A few END() markers.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/amd64/amd64/mptramp.S
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/i386/i386/mptramp.S
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/mptramp.S
diff -u src/sys/arch/amd64/amd64/mptramp.S:1.14 src/sys/arch/amd64/amd64/mptramp.S:1.15
--- src/sys/arch/amd64/amd64/mptramp.S:1.14 Fri Apr 20 22:23:24 2012
+++ src/sys/arch/amd64/amd64/mptramp.S Sat Jun 22 13:09:07 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: mptramp.S,v 1.14 2012/04/20 22:23:24 rmind Exp $ */
+/* $NetBSD: mptramp.S,v 1.15 2013/06/22 13:09:07 uebayasi Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -119,7 +119,8 @@
.text
.align 4,0x0
.code16
-_C_LABEL(cpu_spinup_trampoline):
+/* XXX ENTRY() */
+LABEL(cpu_spinup_trampoline)
cli
xorw %ax,%ax
movw %ax, %ds
@@ -251,14 +252,16 @@ _C_LABEL(cpu_spinup_trampoline_end): #en
movl PCB_CR0(%rsi),%eax
movq %rax,%cr0
call _C_LABEL(cpu_hatch)
+END(cpu_spinup_trampoline)
.data
-_C_LABEL(mp_pdirpa):
+LABEL(mp_pdirpa)
.quad 0
+END(mp_pdirpa)
#ifdef MPDEBUG
- .global _C_LABEL(cpu_trace)
-_C_LABEL(cpu_trace):
+LABEL(cpu_trace)
.quad 0x40
.quad 0xff
.quad 0xff
+END(cpu_trace)
#endif
Index: src/sys/arch/i386/i386/mptramp.S
diff -u src/sys/arch/i386/i386/mptramp.S:1.24 src/sys/arch/i386/i386/mptramp.S:1.25
--- src/sys/arch/i386/i386/mptramp.S:1.24 Fri Apr 20 22:23:24 2012
+++ src/sys/arch/i386/i386/mptramp.S Sat Jun 22 13:09:07 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: mptramp.S,v 1.24 2012/04/20 22:23:24 rmind Exp $ */
+/* $NetBSD: mptramp.S,v 1.25 2013/06/22 13:09:07 uebayasi Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@
*/
#include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: mptramp.S,v 1.24 2012/04/20 22:23:24 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mptramp.S,v 1.25 2013/06/22 13:09:07 uebayasi Exp $");
#include "opt_mpbios.h" /* for MPDEBUG */
@@ -118,7 +118,8 @@ __KERNEL_RCSID(0, "$NetBSD: mptramp.S,v
.text
.align 4,0x0
.code16
-_C_LABEL(cpu_spinup_trampoline):
+/* XXX ENTRY() */
+LABEL(cpu_spinup_trampoline)
cli
xorw %ax,%ax
movw %ax, %ds
@@ -271,14 +272,16 @@ mp_cont:
HALTT(0x30,%ecx)
pushl %ecx
call _C_LABEL(cpu_hatch)
+END(cpu_spinup_trampoline)
.data
-_C_LABEL(mp_pdirpa):
+LABEL(mp_pdirpa)
.long 0
+END(mp_pdirpa)
#ifdef MPDEBUG
- .global _C_LABEL(cpu_trace)
-_C_LABEL(cpu_trace):
+LABEL(cpu_trace)
.long 0x40
.long 0xff
.long 0xff
+END(cpu_trace)
#endif
