Module Name: src
Committed By: cliff
Date: Tue Feb 8 19:50:23 UTC 2011
Modified Files:
src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixl_cpu.c rmixl_cpuvar.h
rmixl_intr.c rmixl_intr.h
Log Message:
- remove sc_ih_clk, sc_ih_fmn, sc_ih_ipi from struct rmixl_cpu_softc;
they were unused just taking up space
- rmixl_intr_init_clk() and rmixl_intr_init_ipi() are now type void
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.18 -r1.1.2.19 src/sys/arch/mips/rmi/rmixl_cpu.c
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/arch/mips/rmi/rmixl_cpuvar.h
cvs rdiff -u -r1.1.2.26 -r1.1.2.27 src/sys/arch/mips/rmi/rmixl_intr.c
cvs rdiff -u -r1.1.2.6 -r1.1.2.7 src/sys/arch/mips/rmi/rmixl_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/mips/rmi/rmixl_cpu.c
diff -u src/sys/arch/mips/rmi/rmixl_cpu.c:1.1.2.18 src/sys/arch/mips/rmi/rmixl_cpu.c:1.1.2.19
--- src/sys/arch/mips/rmi/rmixl_cpu.c:1.1.2.18 Tue Feb 8 06:03:01 2011
+++ src/sys/arch/mips/rmi/rmixl_cpu.c Tue Feb 8 19:50:22 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_cpu.c,v 1.1.2.18 2011/02/08 06:03:01 cliff Exp $ */
+/* $NetBSD: rmixl_cpu.c,v 1.1.2.19 2011/02/08 19:50:22 cliff Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -38,7 +38,7 @@
#include "locators.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_cpu.c,v 1.1.2.18 2011/02/08 06:03:01 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_cpu.c,v 1.1.2.19 2011/02/08 19:50:22 cliff Exp $");
#include "opt_multiprocessor.h"
#include "opt_ddb.h"
@@ -258,9 +258,9 @@
rmixl_fmn_init();
- sc->sc_ih_clk = rmixl_intr_init_clk();
+ rmixl_intr_init_clk();
#ifdef MULTIPROCESSOR
- sc->sc_ih_ipi = rmixl_intr_init_ipi();
+ rmixl_intr_init_ipi();
#endif
#ifdef NOTYET
@@ -269,7 +269,6 @@
if (ih == NULL)
panic("%s: rmixl_fmn_intr_establish failed",
__func__);
- sc->sc_ih_fmn = ih;
#endif
}
Index: src/sys/arch/mips/rmi/rmixl_cpuvar.h
diff -u src/sys/arch/mips/rmi/rmixl_cpuvar.h:1.1.2.2 src/sys/arch/mips/rmi/rmixl_cpuvar.h:1.1.2.3
--- src/sys/arch/mips/rmi/rmixl_cpuvar.h:1.1.2.2 Tue Apr 13 18:15:16 2010
+++ src/sys/arch/mips/rmi/rmixl_cpuvar.h Tue Feb 8 19:50:22 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_cpuvar.h,v 1.1.2.2 2010/04/13 18:15:16 cliff Exp $ */
+/* $NetBSD: rmixl_cpuvar.h,v 1.1.2.3 2011/02/08 19:50:22 cliff Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -40,9 +40,6 @@
struct rmixl_cpu_softc {
device_t sc_dev;
struct cpu_info *sc_ci;
- void *sc_ih_clk;
- void *sc_ih_fmn;
- void *sc_ih_ipi;
struct evcnt sc_vec_evcnts[64];
};
Index: src/sys/arch/mips/rmi/rmixl_intr.c
diff -u src/sys/arch/mips/rmi/rmixl_intr.c:1.1.2.26 src/sys/arch/mips/rmi/rmixl_intr.c:1.1.2.27
--- src/sys/arch/mips/rmi/rmixl_intr.c:1.1.2.26 Tue Feb 8 06:04:20 2011
+++ src/sys/arch/mips/rmi/rmixl_intr.c Tue Feb 8 19:50:22 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_intr.c,v 1.1.2.26 2011/02/08 06:04:20 cliff Exp $ */
+/* $NetBSD: rmixl_intr.c,v 1.1.2.27 2011/02/08 19:50:22 cliff Exp $ */
/*-
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_intr.c,v 1.1.2.26 2011/02/08 06:04:20 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_intr.c,v 1.1.2.27 2011/02/08 19:50:22 cliff Exp $");
#include "opt_multiprocessor.h"
#include "opt_ddb.h"
@@ -446,7 +446,7 @@
* even though cpu_intr() handles the interrupt
* note the 'mpsafe' arg here is a placeholder only
*/
-void *
+void
rmixl_intr_init_clk(void)
{
int vec = ffs(MIPS_INT_MASK_5 >> 8) - 1;
@@ -459,14 +459,13 @@
mutex_exit(&rmixl_intr_lock);
- return ih;
}
#ifdef MULTIPROCESSOR
/*
* establish IPI interrupt and send function
*/
-void *
+void
rmixl_intr_init_ipi(void)
{
u_int ipi, vec;
@@ -487,7 +486,6 @@
mutex_exit(&rmixl_intr_lock);
- return ih;
}
#endif /* MULTIPROCESSOR */
Index: src/sys/arch/mips/rmi/rmixl_intr.h
diff -u src/sys/arch/mips/rmi/rmixl_intr.h:1.1.2.6 src/sys/arch/mips/rmi/rmixl_intr.h:1.1.2.7
--- src/sys/arch/mips/rmi/rmixl_intr.h:1.1.2.6 Sat Feb 5 06:31:06 2011
+++ src/sys/arch/mips/rmi/rmixl_intr.h Tue Feb 8 19:50:22 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_intr.h,v 1.1.2.6 2011/02/05 06:31:06 cliff Exp $ */
+/* $NetBSD: rmixl_intr.h,v 1.1.2.7 2011/02/08 19:50:22 cliff Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -102,9 +102,9 @@
extern void rmixl_vec_disestablish(void *);
extern const char *rmixl_intr_string(int);
extern void rmixl_intr_init_cpu(struct cpu_info *);
-extern void *rmixl_intr_init_clk(void);
+extern void rmixl_intr_init_clk(void);
#ifdef MULTIPROCESSOR
-extern void *rmixl_intr_init_ipi(void);
+extern void rmixl_intr_init_ipi(void);
#endif
#endif /* _MIPS_RMI_RMIXL_INTR_H_ */
