Module Name: src
Committed By: matt
Date: Mon Jun 20 06:23:52 UTC 2011
Modified Files:
src/sys/arch/powerpc/pic: intr.c ipi.c
Log Message:
Cleanup includes. Explicitly include <powerpc/psl.h>
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/powerpc/pic/intr.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/powerpc/pic/ipi.c
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/pic/intr.c
diff -u src/sys/arch/powerpc/pic/intr.c:1.15 src/sys/arch/powerpc/pic/intr.c:1.16
--- src/sys/arch/powerpc/pic/intr.c:1.15 Fri Jun 17 23:36:18 2011
+++ src/sys/arch/powerpc/pic/intr.c Mon Jun 20 06:23:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.15 2011/06/17 23:36:18 matt Exp $ */
+/* $NetBSD: intr.c,v 1.16 2011/06/20 06:23:52 matt Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -27,26 +27,28 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.15 2011/06/17 23:36:18 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.16 2011/06/20 06:23:52 matt Exp $");
+#include "opt_interrupt.h"
#include "opt_multiprocessor.h"
+#include "opt_pic.h"
#define __INTR_PRIVATE
#include <sys/param.h>
-#include <sys/malloc.h>
-#include <sys/kernel.h>
#include <sys/cpu.h>
+#include <sys/kernel.h>
+#include <sys/malloc.h>
+
+#include <powerpc/psl.h>
+#include <powerpc/pic/picvar.h>
-#include <arch/powerpc/pic/picvar.h>
-#include "opt_pic.h"
-#include "opt_interrupt.h"
#if defined(PIC_I8259) || defined (PIC_PREPIVR)
#include <machine/isa_machdep.h>
#endif
#ifdef MULTIPROCESSOR
-#include <arch/powerpc/pic/ipivar.h>
+#include <powerpc/pic/ipivar.h>
#endif
#ifdef __HAVE_FAST_SOFTINTS
Index: src/sys/arch/powerpc/pic/ipi.c
diff -u src/sys/arch/powerpc/pic/ipi.c:1.9 src/sys/arch/powerpc/pic/ipi.c:1.10
--- src/sys/arch/powerpc/pic/ipi.c:1.9 Sun Jun 5 16:52:26 2011
+++ src/sys/arch/powerpc/pic/ipi.c Mon Jun 20 06:23:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ipi.c,v 1.9 2011/06/05 16:52:26 matt Exp $ */
+/* $NetBSD: ipi.c,v 1.10 2011/06/20 06:23:52 matt Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipi.c,v 1.9 2011/06/05 16:52:26 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipi.c,v 1.10 2011/06/20 06:23:52 matt Exp $");
#include "opt_multiprocessor.h"
#include "opt_pic.h"
@@ -42,8 +42,10 @@
#include <sys/atomic.h>
#include <sys/cpu.h>
-#include <arch/powerpc/pic/picvar.h>
-#include <arch/powerpc/pic/ipivar.h>
+#include <powerpc/psl.h>
+
+#include <powerpc/pic/picvar.h>
+#include <powerpc/pic/ipivar.h>
#include "opt_ipi.h"
#ifdef MULTIPROCESSOR
