From 1e3e977e1495abe268e9c57824cb4c1ab28d541b Mon Sep 17 00:00:00 2001 From: mlarkin Date: Thu, 29 Jun 2017 07:51:59 +0000 Subject: [PATCH] suppress local symbols in mptramp. Matches a similar diff in acpi_wakecode.s that was committed previously. Tested MP boot, un-zzz, un-ZZZ, no issues seen. --- sys/arch/i386/i386/mptramp.s | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/arch/i386/i386/mptramp.s b/sys/arch/i386/i386/mptramp.s index 148a7e852e3..ec5fe1fe543 100644 --- a/sys/arch/i386/i386/mptramp.s +++ b/sys/arch/i386/i386/mptramp.s @@ -1,4 +1,4 @@ -/* $OpenBSD: mptramp.s,v 1.21 2017/06/04 23:03:19 naddy Exp $ */ +/* $OpenBSD: mptramp.s,v 1.22 2017/06/29 07:51:59 mlarkin Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -119,13 +119,13 @@ _C_LABEL(cpu_spinup_trampoline): movw %cs, %ax movw %ax, %es movw %ax, %ss - addr32 lgdtl (gdt_desc) # load flat descriptor table + addr32 lgdtl (.Lgdt_desc) # load flat descriptor table movl %cr0, %eax # get cr0 orl $0x1, %eax # enable protected mode movl %eax, %cr0 # doit - ljmpl $0x8, $mp_startup + ljmpl $0x8, $.Lmp_startup -_TRMP_LABEL(mp_startup) +_TRMP_LABEL(.Lmp_startup) .code32 movl $0x10, %eax # data segment @@ -222,11 +222,11 @@ mp_cont: .section .rodata _C_LABEL(mp_tramp_data_start): -_TRMP_DATA_LABEL(gdt_table) +_TRMP_DATA_LABEL(.Lgdt_table) .word 0x0,0x0,0x0,0x0 # null GDTE GDTE(0x9f,0xcf) # Kernel text GDTE(0x93,0xcf) # Kernel data -_TRMP_DATA_OFFSET(gdt_desc) +_TRMP_DATA_OFFSET(.Lgdt_desc) .word 0x17 # limit 3 entries - .long gdt_table # where is gdt + .long .Lgdt_table # where is gdt _C_LABEL(mp_tramp_data_end): -- 2.20.1