[src/trunk]: src/sys/arch/i386/include Wrap some areas with #ifndef _LOCORE s...

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

details:   https://anonhg.NetBSD.org/src/rev/c73cd99106e7
branches:  trunk
changeset: 556722:c73cd99106e7
user:      jmc <jmc%NetBSD.org@localhost>
date:      Thu Dec 25 21:03:55 2003 +0000

description:
Wrap some areas with #ifndef _LOCORE so assembly files can pick up some defs
from here. Needed for bioscall fixes in PR#14946

diffstat:

 sys/arch/i386/include/apmvar.h |  7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diffs (34 lines):

diff -r 8bb9a1e1acf7 -r c73cd99106e7 sys/arch/i386/include/apmvar.h
--- a/sys/arch/i386/include/apmvar.h    Thu Dec 25 21:02:58 2003 +0000
+++ b/sys/arch/i386/include/apmvar.h    Thu Dec 25 21:03:55 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: apmvar.h,v 1.18 2003/10/27 13:44:20 junyoung Exp $     */
+/*     $NetBSD: apmvar.h,v 1.19 2003/12/25 21:03:55 jmc Exp $  */
 /*-
  * Copyright (c) 1995 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -38,7 +38,10 @@
 #define __I386_APM_H__
 
 #include <dev/apm/apmbios.h>
+
+#ifndef _LOCORE
 #include <dev/apm/apmio.h>
+#endif /* _LCORE */
 
 /*
  * virtual & physical address of the trampoline
@@ -46,6 +49,7 @@
  */
 #define APM_BIOSTRAMP  PAGE_SIZE
 
+#ifndef _LOCORE
 /* filled in by apmcall */ 
 
 struct apm_connect_info {
@@ -76,4 +80,5 @@
 int apm_set_powstate(u_int devid, u_int powstate);
 int apm_busprobe(void);
 #endif /* _KERNEL */
+#endif /* _LOCORE */
 #endif /* __i386_apm_h__ */