From: John Marino <draco@marino.st>
Date: Sat, 25 Oct 2014 06:45:46 +0000 (+0200)
Subject: pc64/acpica: specify cmpw in acpi_wakecode.S
X-Git-Tag: v4.1.0~10
X-Git-Url: https://gitweb.dragonflybsd.org/~tuxillo/dragonfly.git/commitdiff_plain/0993d469636ba23b0855f1446d91805dc3509c44

pc64/acpica: specify cmpw in acpi_wakecode.S

The "cmp" instruction is ambiguious in acpi_wakecode.S.  The GNU assembler
should emit an error, but instead it just assumes that the operand is of
a wide type.  The clang assembler does throw an error, so let's explicitly
use "cmpw" to resolve the ambuiguity.
---

diff --git a/sys/platform/pc64/acpica/acpi_wakecode.S b/sys/platform/pc64/acpica/acpi_wakecode.S
index 0ecc8240c5..f76616945a 100644
--- a/sys/platform/pc64/acpica/acpi_wakecode.S
+++ b/sys/platform/pc64/acpica/acpi_wakecode.S
@@ -49,7 +49,7 @@ wakeup_16:
 	movw	$PAGE_SIZE,%sp
 
 	/* Re-initialize video BIOS if the reset_video tunable is set. */
-	cmp	$0,reset_video
+	cmpw	$0,reset_video
 	je	wakeup_16_gdt
 	lcall	$0xc000,$3