[src/trunk]: src/sys/arch/powerpc/include Fix kern_softint.c errors (tested w...

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

details:   https://anonhg.NetBSD.org/src/rev/5abbecfe9be1
branches:  trunk
changeset: 789576:5abbecfe9be1
user:      matt <matt%NetBSD.org@localhost>
date:      Fri Aug 23 06:18:14 2013 +0000

description:
Fix kern_softint.c errors (tested with WALNUT & EV64260)

diffstat:

 sys/arch/powerpc/include/intr.h    |  12 +++++++-----
 sys/arch/powerpc/include/softint.h |   9 +++++----
 2 files changed, 12 insertions(+), 9 deletions(-)

diffs (79 lines):

diff -r f3b6e29a6347 -r 5abbecfe9be1 sys/arch/powerpc/include/intr.h
--- a/sys/arch/powerpc/include/intr.h   Fri Aug 23 05:22:01 2013 +0000
+++ b/sys/arch/powerpc/include/intr.h   Fri Aug 23 06:18:14 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intr.h,v 1.10 2012/01/14 19:35:58 phx Exp $ */
+/*     $NetBSD: intr.h,v 1.11 2013/08/23 06:18:14 matt Exp $ */
 
 /*-
  * Copyright (c) 2007 Michael Lorenz
@@ -28,11 +28,11 @@
 
 #ifndef _LOCORE
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.h,v 1.10 2012/01/14 19:35:58 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.h,v 1.11 2013/08/23 06:18:14 matt Exp $");
 #endif
 
-#ifndef POWERPC_INTR_MACHDEP_H
-#define POWERPC_INTR_MACHDEP_H
+#ifndef _POWERPC_INTR_MACHDEP_H_
+#define _POWERPC_INTR_MACHDEP_H_
 
 #define        __HAVE_FAST_SOFTINTS    1
 
@@ -71,6 +71,8 @@
 
 #if !defined(_MODULE)
 
+#include <powerpc/softint.h>
+
 void   genppc_cpu_configure(void);
 
 /*
@@ -136,4 +138,4 @@
 
 #endif /* _LOCORE */
 
-#endif /* POWERPC_INTR_MACHDEP_H */
+#endif /* _POWERPC_INTR_MACHDEP_H_ */
diff -r f3b6e29a6347 -r 5abbecfe9be1 sys/arch/powerpc/include/softint.h
--- a/sys/arch/powerpc/include/softint.h        Fri Aug 23 05:22:01 2013 +0000
+++ b/sys/arch/powerpc/include/softint.h        Fri Aug 23 06:18:14 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: softint.h,v 1.1 2011/06/14 22:36:12 matt Exp $ */
+/*     $NetBSD: softint.h,v 1.2 2013/08/23 06:18:14 matt Exp $ */
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -34,14 +34,14 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef __INTR_PRIVATE
 #ifndef _POWERPC_SOFTINT_H_
 #define _POWERPC_SOFTINT_H_
 
-#include <sys/intr.h>
+//#include <sys/intr.h>
 
 #ifdef __HAVE_FAST_SOFTINTS
 
+#ifdef __INTR_PRIVATE
 #ifdef __HAVE_PREEMPTION
 #define        IPL_PREEMPT_SOFTMASK    (1 << IPL_NONE)
 #else
@@ -66,6 +66,8 @@
            |(SOFTINT_CLOCK  << (4*IPL_SOFTCLOCK )))
 #define        IPL2SOFTINT(ipl)        ((IPL2SOFTINT_MAP >> (4 * (ipl))) & 0x0f)
 
+#endif /* __INTR_PRIVATE */
+
 #ifdef _KERNEL
 void   powerpc_softint(struct cpu_info *, int, vaddr_t);
 void   powerpc_softint_init_md(lwp_t *, u_int, uintptr_t *);
@@ -74,4 +76,3 @@
 
 #endif /* __HAVE_FAST_SOFTINTS */
 #endif /* !_POWERPC_SOFTINT_H_ */
-#endif /* __INTR_PRIVATE */