[src/trunk]: src/sys/arch A few END() markers.

[uebayasi <uebayasi%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b936af8591cc
branches:  trunk
changeset: 787536:b936af8591cc
user:      uebayasi <uebayasi%NetBSD.org@localhost>
date:      Sat Jun 22 13:09:07 2013 +0000

description:
A few END() markers.

diffstat:

 sys/arch/amd64/amd64/mptramp.S |  13 ++++++++-----
 sys/arch/i386/i386/mptramp.S   |  15 +++++++++------
 2 files changed, 17 insertions(+), 11 deletions(-)

diffs (87 lines):

diff -r a77e61adc881 -r b936af8591cc sys/arch/amd64/amd64/mptramp.S
--- a/sys/arch/amd64/amd64/mptramp.S    Sat Jun 22 09:25:33 2013 +0000
+++ b/sys/arch/amd64/amd64/mptramp.S    Sat Jun 22 13:09:07 2013 +0000
@@ -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 @@
        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
diff -r a77e61adc881 -r b936af8591cc sys/arch/i386/i386/mptramp.S
--- a/sys/arch/i386/i386/mptramp.S      Sat Jun 22 09:25:33 2013 +0000
+++ b/sys/arch/i386/i386/mptramp.S      Sat Jun 22 13:09:07 2013 +0000
@@ -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 @@
        .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 @@
        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