Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/sparc64/include sun4v: Fix build issue introduced i...



details:   https://anonhg.NetBSD.org/src/rev/876c3054e470
branches:  trunk
changeset: 346082:876c3054e470
user:      palle <palle%NetBSD.org@localhost>
date:      Thu Jun 23 20:32:40 2016 +0000

description:
sun4v: Fix build issue introduced in previous commit - bus stuff is kernel only, so protect this with _KERNEL

diffstat:

 sys/arch/sparc64/include/cpu.h |  7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diffs (48 lines):

diff -r fd2718f7ae71 -r 876c3054e470 sys/arch/sparc64/include/cpu.h
--- a/sys/arch/sparc64/include/cpu.h    Thu Jun 23 07:32:12 2016 +0000
+++ b/sys/arch/sparc64/include/cpu.h    Thu Jun 23 20:32:40 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.h,v 1.120 2016/06/22 20:13:00 palle Exp $ */
+/*     $NetBSD: cpu.h,v 1.121 2016/06/23 20:32:40 palle Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -63,7 +63,6 @@
 #include "opt_lockdebug.h"
 #endif
 
-#include <machine/bus_defs.h>
 #include <machine/psl.h>
 #include <machine/reg.h>
 #include <machine/pte.h>
@@ -71,6 +70,7 @@
 #if defined(_KERNEL)
 #include <machine/cpuset.h>
 #include <sparc64/sparc64/intreg.h>
+#include <sparc64/bus_defs.h>
 #endif
 #ifdef SUN4V
 #include <machine/hypervisor.h>
@@ -342,12 +342,14 @@
  */
 void cpu_signotify(struct lwp *);
 
+
 /*
  * Interrupt handler chains.  Interrupt handlers should return 0 for
  * ``not me'' or 1 (``I took care of it'').  intr_establish() inserts a
  * handler into the list.  The handler is called with its (single)
  * argument, or with a pointer to a clockframe if ih_arg is NULL.
  */
+#if defined(_KERNEL)
 struct intrhand {
        int                     (*ih_fun)(void *);
        void                    *ih_arg;
@@ -368,6 +370,7 @@
        uint32_t                ih_ivec;
        char                    ih_name[32];    /* name for the above */
 };
+#endif
 extern struct intrhand *intrhand[];
 extern struct intrhand *intrlev[MAXINTNUM];
 



Home | Main Index | Thread Index | Old Index