Module Name: src
Committed By: matt
Date: Sat Feb 6 02:57:44 UTC 2010
Modified Files:
src/sys/arch/algor/include [matt-nb5-mips64]: intr.h
src/sys/arch/arc/include [matt-nb5-mips64]: intr.h
src/sys/arch/cobalt/include [matt-nb5-mips64]: intr.h
src/sys/arch/evbmips/include [matt-nb5-mips64]: intr.h
src/sys/arch/pmax/include [matt-nb5-mips64]: intr.h
src/sys/arch/sgimips/include [matt-nb5-mips64]: intr.h
Removed Files:
src/sys/arch/mips/include [matt-nb5-mips64]: softintr.h
Log Message:
<mips/softintr.h> is no longer needed.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.13.18.1 src/sys/arch/algor/include/intr.h
cvs rdiff -u -r1.22 -r1.22.18.1 src/sys/arch/arc/include/intr.h
cvs rdiff -u -r1.32 -r1.32.12.1 src/sys/arch/cobalt/include/intr.h
cvs rdiff -u -r1.16.18.1 -r1.16.18.2 src/sys/arch/evbmips/include/intr.h
cvs rdiff -u -r1.4 -r0 src/sys/arch/mips/include/softintr.h
cvs rdiff -u -r1.32 -r1.32.28.1 src/sys/arch/pmax/include/intr.h
cvs rdiff -u -r1.25 -r1.25.36.1 src/sys/arch/sgimips/include/intr.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/algor/include/intr.h
diff -u src/sys/arch/algor/include/intr.h:1.13 src/sys/arch/algor/include/intr.h:1.13.18.1
--- src/sys/arch/algor/include/intr.h:1.13 Mon Apr 28 20:23:10 2008
+++ src/sys/arch/algor/include/intr.h Sat Feb 6 02:57:43 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.13 2008/04/28 20:23:10 martin Exp $ */
+/* $NetBSD: intr.h,v 1.13.18.1 2010/02/06 02:57:43 matt Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -96,8 +96,6 @@
const void *ih_irqmap;
};
-#include <mips/softintr.h>
-
extern struct evcnt mips_int5_evcnt;
void intr_init(void);
Index: src/sys/arch/arc/include/intr.h
diff -u src/sys/arch/arc/include/intr.h:1.22 src/sys/arch/arc/include/intr.h:1.22.18.1
--- src/sys/arch/arc/include/intr.h:1.22 Mon Apr 28 20:23:13 2008
+++ src/sys/arch/arc/include/intr.h Sat Feb 6 02:57:43 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.22 2008/04/28 20:23:13 martin Exp $ */
+/* $NetBSD: intr.h,v 1.22.18.1 2010/02/06 02:57:43 matt Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -86,8 +86,6 @@
#include <sys/spl.h>
-#include <mips/softintr.h>
-
struct clockframe;
void arc_set_intr(uint32_t, uint32_t (*)(uint32_t, struct clockframe *), int);
extern uint32_t cpu_int_mask;
Index: src/sys/arch/cobalt/include/intr.h
diff -u src/sys/arch/cobalt/include/intr.h:1.32 src/sys/arch/cobalt/include/intr.h:1.32.12.1
--- src/sys/arch/cobalt/include/intr.h:1.32 Wed Oct 1 02:44:14 2008
+++ src/sys/arch/cobalt/include/intr.h Sat Feb 6 02:57:43 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.32 2008/10/01 02:44:14 uebayasi Exp $ */
+/* $NetBSD: intr.h,v 1.32.12.1 2010/02/06 02:57:43 matt Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang. All rights reserved.
@@ -94,8 +94,6 @@
#define COBALT_COOKIE_TYPE_ICU 0x2
};
-#include <mips/softintr.h>
-
void intr_init(void);
void *cpu_intr_establish(int, int, int (*)(void *), void *);
void *icu_intr_establish(int, int, int, int (*)(void *), void *);
Index: src/sys/arch/evbmips/include/intr.h
diff -u src/sys/arch/evbmips/include/intr.h:1.16.18.1 src/sys/arch/evbmips/include/intr.h:1.16.18.2
--- src/sys/arch/evbmips/include/intr.h:1.16.18.1 Fri Sep 25 22:21:42 2009
+++ src/sys/arch/evbmips/include/intr.h Sat Feb 6 02:57:43 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.16.18.1 2009/09/25 22:21:42 cliff Exp $ */
+/* $NetBSD: intr.h,v 1.16.18.2 2010/02/06 02:57:43 matt Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -99,8 +99,6 @@
int ih_ipl;
};
-#include <mips/softintr.h>
-
void evbmips_intr_init(void);
void intr_init(void);
void evbmips_iointr(uint32_t, uint32_t, uint32_t, uint32_t);
Index: src/sys/arch/pmax/include/intr.h
diff -u src/sys/arch/pmax/include/intr.h:1.32 src/sys/arch/pmax/include/intr.h:1.32.28.1
--- src/sys/arch/pmax/include/intr.h:1.32 Fri Jan 4 21:54:05 2008
+++ src/sys/arch/pmax/include/intr.h Sat Feb 6 02:57:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.32 2008/01/04 21:54:05 ad Exp $ */
+/* $NetBSD: intr.h,v 1.32.28.1 2010/02/06 02:57:44 matt Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -128,8 +128,6 @@
void *ih_arg;
};
-#include <mips/softintr.h>
-
extern struct evcnt pmax_clock_evcnt;
extern struct evcnt pmax_fpu_evcnt;
extern struct evcnt pmax_memerr_evcnt;
Index: src/sys/arch/sgimips/include/intr.h
diff -u src/sys/arch/sgimips/include/intr.h:1.25 src/sys/arch/sgimips/include/intr.h:1.25.36.1
--- src/sys/arch/sgimips/include/intr.h:1.25 Mon Dec 3 15:34:17 2007
+++ src/sys/arch/sgimips/include/intr.h Sat Feb 6 02:57:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.25 2007/12/03 15:34:17 ad Exp $ */
+/* $NetBSD: intr.h,v 1.25.36.1 2010/02/06 02:57:44 matt Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang
@@ -110,9 +110,6 @@
return _splraise(icookie._spl);
}
-
-#include <mips/softintr.h>
-
#endif /* _LOCORE */
#endif /* !_KERNEL */
