Module Name: src
Committed By: martin
Date: Mon May 24 09:49:17 UTC 2010
Modified Files:
src/sys/arch/sparc64/include: cpu.h intr.h
src/sys/arch/sparc64/sparc64: ipifuncs.c
Log Message:
Make C declarations match assembler reality: ipi functions get two arguments
(which most of them (partly) ignore, but anyway).
To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 src/sys/arch/sparc64/include/cpu.h
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/sparc64/include/intr.h
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/sparc64/sparc64/ipifuncs.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/sparc64/include/cpu.h
diff -u src/sys/arch/sparc64/include/cpu.h:1.90 src/sys/arch/sparc64/include/cpu.h:1.91
--- src/sys/arch/sparc64/include/cpu.h:1.90 Sun Mar 28 05:24:00 2010
+++ src/sys/arch/sparc64/include/cpu.h Mon May 24 09:49:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.90 2010/03/28 05:24:00 mrg Exp $ */
+/* $NetBSD: cpu.h,v 1.91 2010/05/24 09:49:17 martin Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -248,7 +248,7 @@
* broadcast - send to to all cpus but ourselves
* send - send to just this cpu
*/
-typedef void (* ipifunc_t)(void *);
+typedef void (* ipifunc_t)(void *, void *);
void sparc64_multicast_ipi(sparc64_cpuset_t, ipifunc_t, uint64_t, uint64_t);
void sparc64_broadcast_ipi(ipifunc_t, uint64_t, uint64_t);
Index: src/sys/arch/sparc64/include/intr.h
diff -u src/sys/arch/sparc64/include/intr.h:1.28 src/sys/arch/sparc64/include/intr.h:1.29
--- src/sys/arch/sparc64/include/intr.h:1.28 Sat Mar 6 08:08:29 2010
+++ src/sys/arch/sparc64/include/intr.h Mon May 24 09:49:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.28 2010/03/06 08:08:29 mrg Exp $ */
+/* $NetBSD: intr.h,v 1.29 2010/05/24 09:49:17 martin Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -61,12 +61,13 @@
#if defined(MULTIPROCESSOR)
#ifndef _LOCORE
void sparc64_ipi_init (void);
-void sparc64_ipi_halt_thiscpu (void *);
+void sparc64_ipi_halt_thiscpu (void *, void *);
void sparc64_ipi_pause_thiscpu (void *);
void sparc64_do_pause(void);
-void sparc64_ipi_drop_fpstate (void *);
-void sparc64_ipi_save_fpstate (void *);
-void sparc64_ipi_nop (void *);
+void sparc64_ipi_drop_fpstate (void *, void *);
+void sparc64_ipi_save_fpstate (void *, void *);
+void sparc64_ipi_nop (void *, void *);
+void sparc64_ipi_ccall(void *, void *);
void mp_halt_cpus (void);
void mp_pause_cpus (void);
void mp_resume_cpus (void);
Index: src/sys/arch/sparc64/sparc64/ipifuncs.c
diff -u src/sys/arch/sparc64/sparc64/ipifuncs.c:1.36 src/sys/arch/sparc64/sparc64/ipifuncs.c:1.37
--- src/sys/arch/sparc64/sparc64/ipifuncs.c:1.36 Sun Mar 28 05:24:00 2010
+++ src/sys/arch/sparc64/sparc64/ipifuncs.c Mon May 24 09:49:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ipifuncs.c,v 1.36 2010/03/28 05:24:00 mrg Exp $ */
+/* $NetBSD: ipifuncs.c,v 1.37 2010/05/24 09:49:17 martin Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipifuncs.c,v 1.36 2010/03/28 05:24:00 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipifuncs.c,v 1.37 2010/05/24 09:49:17 martin Exp $");
#include "opt_ddb.h"
@@ -67,19 +67,19 @@
/*
* These are the "function" entry points in locore.s to handle IPI's.
*/
-void sparc64_ipi_halt(void *);
-void sparc64_ipi_pause(void *);
-void sparc64_ipi_flush_pte_us(void *);
-void sparc64_ipi_flush_pte_usiii(void *);
-void sparc64_ipi_dcache_flush_page_us(void *);
-void sparc64_ipi_dcache_flush_page_usiii(void *);
-void sparc64_ipi_blast_dcache(void *);
+void sparc64_ipi_halt(void *, void *);
+void sparc64_ipi_pause(void *, void *);
+void sparc64_ipi_flush_pte_us(void *, void *);
+void sparc64_ipi_flush_pte_usiii(void *, void *);
+void sparc64_ipi_dcache_flush_page_us(void *, void *);
+void sparc64_ipi_dcache_flush_page_usiii(void *, void *);
+void sparc64_ipi_blast_dcache(void *, void *);
/*
* Process cpu stop-self event.
*/
void
-sparc64_ipi_halt_thiscpu(void *arg)
+sparc64_ipi_halt_thiscpu(void *arg, void *arg2)
{
extern void prom_printf(const char *fmt, ...);
