[src/trunk]: src/sys/arch/amd64/amd64 Pass the name of the function as argume...

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

details:   https://anonhg.NetBSD.org/src/rev/0596d75e990a
branches:  trunk
changeset: 359639:0596d75e990a
user:      maxv <maxv%NetBSD.org@localhost>
date:      Sun Feb 18 14:32:31 2018 +0000

description:
Pass the name of the function as argument in SWAPGS_HANDLER.

diffstat:

 sys/arch/amd64/amd64/amd64_trap.S |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (38 lines):

diff -r 8f1c669f0810 -r 0596d75e990a sys/arch/amd64/amd64/amd64_trap.S
--- a/sys/arch/amd64/amd64/amd64_trap.S Sun Feb 18 14:07:29 2018 +0000
+++ b/sys/arch/amd64/amd64/amd64_trap.S Sun Feb 18 14:32:31 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: amd64_trap.S,v 1.31 2018/02/17 21:05:58 maxv Exp $     */
+/*     $NetBSD: amd64_trap.S,v 1.32 2018/02/18 14:32:31 maxv Exp $     */
 
 /*
  * Copyright (c) 1998, 2007, 2008, 2017 The NetBSD Foundation, Inc.
@@ -312,8 +312,8 @@
  * When such traps happen, we have CPL=0 and %gs=userland, and we must perform
  * an additional swapgs to get %gs=kernel.
  */
-.macro SWAPGS_HANDLER
-NENTRY(check_swapgs)
+.macro SWAPGS_HANDLER  name
+NENTRY(\name)
        INTRENTRY_L(3f,1:)
 2:
        sti
@@ -345,7 +345,7 @@
        cmpw    $0x8e+050*256,%ax       /* Any move to %gs (reg 5) */
        jne     2b                      /* No - normal kernel fault */
        jmp     1b                      /* Yes - restore %gs */
-END(check_swapgs)
+END(\name)
 .endm
 #endif
 
@@ -389,7 +389,7 @@
 TRAP_ENTRY_POINT_SPUR  intrspurious,T_ASTFLT,1
 
 #ifndef check_swapgs
-SWAPGS_HANDLER
+SWAPGS_HANDLER         check_swapgs
 #endif
 
        TEXT_USER_END