Module Name: src
Committed By: matt
Date: Fri Aug 23 06:18:14 UTC 2013
Modified Files:
src/sys/arch/powerpc/include: intr.h softint.h
Log Message:
Fix kern_softint.c errors (tested with WALNUT & EV64260)
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/powerpc/include/intr.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/powerpc/include/softint.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/powerpc/include/intr.h
diff -u src/sys/arch/powerpc/include/intr.h:1.10 src/sys/arch/powerpc/include/intr.h:1.11
--- src/sys/arch/powerpc/include/intr.h:1.10 Sat Jan 14 19:35:58 2012
+++ src/sys/arch/powerpc/include/intr.h Fri Aug 23 06:18:14 2013
@@ -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 @@ void splx(int);
#if !defined(_MODULE)
+#include <powerpc/softint.h>
+
void genppc_cpu_configure(void);
/*
@@ -136,4 +138,4 @@ splraiseipl(ipl_cookie_t icookie)
#endif /* _LOCORE */
-#endif /* POWERPC_INTR_MACHDEP_H */
+#endif /* _POWERPC_INTR_MACHDEP_H_ */
Index: src/sys/arch/powerpc/include/softint.h
diff -u src/sys/arch/powerpc/include/softint.h:1.1 src/sys/arch/powerpc/include/softint.h:1.2
--- src/sys/arch/powerpc/include/softint.h:1.1 Tue Jun 14 22:36:12 2011
+++ src/sys/arch/powerpc/include/softint.h Fri Aug 23 06:18:14 2013
@@ -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 @@ void powerpc_softint_trigger(uintptr_t);
#endif /* __HAVE_FAST_SOFTINTS */
#endif /* !_POWERPC_SOFTINT_H_ */
-#endif /* __INTR_PRIVATE */
