Module Name: src
Committed By: maxv
Date: Wed Nov 1 09:47:53 UTC 2017
Modified Files:
src/sys/arch/amd64/acpi: acpi_wakeup_low.S
Log Message:
Use NENTRY -> END.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/amd64/acpi/acpi_wakeup_low.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/acpi/acpi_wakeup_low.S
diff -u src/sys/arch/amd64/acpi/acpi_wakeup_low.S:1.8 src/sys/arch/amd64/acpi/acpi_wakeup_low.S:1.9
--- src/sys/arch/amd64/acpi/acpi_wakeup_low.S:1.8 Sat Oct 21 06:55:54 2017
+++ src/sys/arch/amd64/acpi/acpi_wakeup_low.S Wed Nov 1 09:47:53 2017
@@ -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 <jo...@netbsd.org>
* Copyright (c) 2001 Takanori Watanabe <takaw...@jp.freebsd.org>
* Copyright (c) 2001 Mitsuru IWASAKI <iwas...@jp.freebsd.org>
@@ -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 @@ acpi_md_sleep_exit:
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_prepare:
/* acpi_md_sleep_enter only returns on failure. */
movl $-1,%eax
ret
+END(acpi_md_sleep_prepare)
