Module Name: src
Committed By: palle
Date: Sat Jun 25 13:52:04 UTC 2016
Modified Files:
src/sys/arch/sparc64/include: cpu.h
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.121 -r1.122 src/sys/arch/sparc64/include/cpu.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc64/include/cpu.h
diff -u src/sys/arch/sparc64/include/cpu.h:1.121 src/sys/arch/sparc64/include/cpu.h:1.122
--- src/sys/arch/sparc64/include/cpu.h:1.121 Thu Jun 23 20:32:40 2016
+++ src/sys/arch/sparc64/include/cpu.h Sat Jun 25 13:52:04 2016
@@ -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 @@ void cpu_signotify(struct lwp *);
* 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 @@ struct intrhand {
uint32_t ih_ivec;
char ih_name[32]; /* name for the above */
};
-#endif
extern struct intrhand *intrhand[];
extern struct intrhand *intrlev[MAXINTNUM];
