Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/amd64/acpi Use NENTRY -> END.



details:   https://anonhg.NetBSD.org/src/rev/8c6ba5204e7b
branches:  trunk
changeset: 827534:8c6ba5204e7b
user:      maxv <maxv%NetBSD.org@localhost>
date:      Wed Nov 01 09:47:53 2017 +0000

description:
Use NENTRY -> END.

diffstat:

 sys/arch/amd64/acpi/acpi_wakeup_low.S |  14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diffs (43 lines):

diff -r fcee90dcd2e0 -r 8c6ba5204e7b sys/arch/amd64/acpi/acpi_wakeup_low.S
--- a/sys/arch/amd64/acpi/acpi_wakeup_low.S     Wed Nov 01 09:38:43 2017 +0000
+++ b/sys/arch/amd64/acpi/acpi_wakeup_low.S     Wed Nov 01 09:47:53 2017 +0000
@@ -1,6 +1,6 @@
-/*     $NetBSD: acpi_wakeup_low.S,v 1.8 2017/10/21 06:55:54 maxv Exp $ */
+/*     $NetBSD: acpi_wakeup_low.S,v 1.9 2017/11/01 09:47:53 maxv Exp $ */
 
-/*-
+/*
  * Copyright (c) 2007 Joerg Sonnenberger <joerg%netbsd.org@localhost>
  * Copyright (c) 2001 Takanori Watanabe <takawata%jp.freebsd.org@localhost>
  * Copyright (c) 2001 Mitsuru IWASAKI <iwasaki%jp.freebsd.org@localhost>
@@ -34,9 +34,9 @@
 #include <machine/specialreg.h>
 
        .text
+
        .p2align 2, 0x90
-       .globl acpi_md_sleep_exit
-acpi_md_sleep_exit:
+NENTRY(acpi_md_sleep_exit)
        lgdt    ACPI_SUSPEND_GDT(%r8)
 
        /* Reload fixed descriptors for new GDT */
@@ -110,11 +110,10 @@
        pushq   ACPI_SUSPEND_REG+(7*8)(%r8)
        popfq
        ret
+END(acpi_md_sleep_exit)
 
        .p2align 2, 0x90
-       .type acpi_md_sleep_prepare, @function
-       .globl acpi_md_sleep_prepare
-acpi_md_sleep_prepare:
+NENTRY(acpi_md_sleep_prepare)
        movq    CPUVAR(SELF),%r8
        movq    %rbx,ACPI_SUSPEND_REG+(1*8)(%r8)
        movq    %rbp,ACPI_SUSPEND_REG+(2*8)(%r8)
@@ -167,3 +166,4 @@
        /* acpi_md_sleep_enter only returns on failure. */
        movl    $-1,%eax
        ret
+END(acpi_md_sleep_prepare)



Home | Main Index | Thread Index | Old Index