[src/netbsd-1-4]: src/sys/arch/i386/i386 Pull up revision 1.6 (requested by j...

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

details:   https://anonhg.NetBSD.org/src/rev/3a5ac10d97ce
branches:  netbsd-1-4
changeset: 469689:3a5ac10d97ce
user:      he <he%NetBSD.org@localhost>
date:      Tue Nov 09 22:01:22 1999 +0000

description:
Pull up revision 1.6 (requested by joda):
  Make a standard kernel usable on IBM laptops (and possibly others).
  Some machines require interrupts enabled at suspend-time in order
  to avoid a hang at resume.  Fixes PR#6279.

diffstat:

 sys/arch/i386/i386/apmcall.s |  12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diffs (35 lines):

diff -r 9c290a76b3d2 -r 3a5ac10d97ce sys/arch/i386/i386/apmcall.s
--- a/sys/arch/i386/i386/apmcall.s      Tue Nov 09 21:54:58 1999 +0000
+++ b/sys/arch/i386/i386/apmcall.s      Tue Nov 09 22:01:22 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: apmcall.s,v 1.5 1998/12/01 04:30:59 thorpej Exp $ */
+/*     $NetBSD: apmcall.s,v 1.5.4.1 1999/11/09 22:01:22 he Exp $ */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -49,7 +49,12 @@
  *     returns nonzero if error returned by APM.
  */
        .data
+       .globl  _C_LABEL(apm_disable_interrupts)
 apmstatus:     .long 0
+#ifndef APM_DISABLE_INTERRUPTS
+#define APM_DISABLE_INTERRUPTS 1
+#endif
+_C_LABEL(apm_disable_interrupts):      .long APM_DISABLE_INTERRUPTS
        .text
 NENTRY(apmcall)
        pushl   %ebp
@@ -78,8 +83,11 @@
        movl    %cs:BIOSCALLREG_EBX(%ebx),%ebx
        pushfl
        movl    $0,apmstatus    /* zero out just in case %ds is hosed? */
+       cmp     $0, _C_LABEL(apm_disable_interrupts)
+       je      nocli
+       cli
+nocli:
        clc /* clear carry in case BIOS doesn't do it for us on no-error */
-       cli
        pushl   %ds
        /* Now call the 32-bit code segment entry point */
        lcall   %cs:(_C_LABEL(apminfo)+APM_ENTRY)