From 131f65b2eca607be2504b2d2426fa3fef9f52dec Mon Sep 17 00:00:00 2001
From: drochner <drochner@NetBSD.org>
Date: Sun, 13 Jan 2002 12:45:54 +0000
Subject: [PATCH] -fix new assembler warnings -add RCS ID

---
 sys/arch/i386/i386/apmcall.s | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/sys/arch/i386/i386/apmcall.s b/sys/arch/i386/i386/apmcall.s
index 33e5f26b0673..85e994fc7c22 100644
--- a/sys/arch/i386/i386/apmcall.s
+++ b/sys/arch/i386/i386/apmcall.s
@@ -1,4 +1,4 @@
-/*	$NetBSD: apmcall.s,v 1.8 2001/05/21 06:13:12 perry Exp $ */
+/*	$NetBSD: apmcall.s,v 1.9 2002/01/13 12:45:54 drochner Exp $ */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -43,6 +43,8 @@
 
 #include "opt_apm.h"
 
+__KERNEL_RCSID(0, "$NetBSD: apmcall.s,v 1.9 2002/01/13 12:45:54 drochner Exp $");
+
 /* LINTSTUB: include <machine/bioscall.h> */
 /* LINTSTUB: include <machine/apmvar.h> */
 
@@ -74,11 +76,11 @@ NENTRY(apmcall)
 	pushl	%es
 	pushl	%fs
 	pushl	%gs
-	xorl	%ax,%ax
+	xorl	%eax,%eax
 /*	movl	%ax,%ds		# can't toss %ds, we need it for apmstatus*/
-	movl	%ax,%es
-	movl	%ax,%fs
-	movl	%ax,%gs
+	movw	%ax,%es
+	movw	%ax,%fs
+	movw	%ax,%gs
 #endif
 	xorl	%eax,%eax
 	movb	%cs:8(%ebp),%al
@@ -96,7 +98,7 @@ nocli:
 	clc /* clear carry in case BIOS doesn't do it for us on no-error */
 	pushl	%ds
 	/* Now call the 32-bit code segment entry point */
-	lcall	%cs:(_C_LABEL(apminfo)+APM_ENTRY)
+	lcall	*%cs:(_C_LABEL(apminfo)+APM_ENTRY)
 	popl	%ds
 	setc	apmstatus
 	popfl