[src/trunk]: src/sys/arch/sparc64/include sun4v: fix previous fix - no need t...

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

details:   https://anonhg.NetBSD.org/src/rev/eb58a43d1b49
branches:  trunk
changeset: 816238:eb58a43d1b49
user:      palle <palle%NetBSD.org@localhost>
date:      Sat Jun 25 13:52:04 2016 +0000

description:
sun4v: fix previous fix - no need to protect "struct inthand" with "#if defined(_KERNEL)" + use proper include file name - sparc64/bus_defs.h -> machine/bus_defs.h

diffstat:

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

diffs (36 lines):

diff -r 5112f7295686 -r eb58a43d1b49 sys/arch/sparc64/include/cpu.h
--- a/sys/arch/sparc64/include/cpu.h    Sat Jun 25 04:53:32 2016 +0000
+++ b/sys/arch/sparc64/include/cpu.h    Sat Jun 25 13:52:04 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.h,v 1.121 2016/06/23 20:32:40 palle Exp $ */
+/*     $NetBSD: cpu.h,v 1.122 2016/06/25 13:52:04 palle Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -68,9 +68,9 @@
 #include <machine/pte.h>
 #include <machine/intr.h>
 #if defined(_KERNEL)
+#include <machine/bus_defs.h>
 #include <machine/cpuset.h>
 #include <sparc64/sparc64/intreg.h>
-#include <sparc64/bus_defs.h>
 #endif
 #ifdef SUN4V
 #include <machine/hypervisor.h>
@@ -349,7 +349,6 @@
  * 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;
@@ -370,7 +369,6 @@
        uint32_t                ih_ivec;
        char                    ih_name[32];    /* name for the above */
 };
-#endif
 extern struct intrhand *intrhand[];
 extern struct intrhand *intrlev[MAXINTNUM];