Module Name: src
Committed By: maxv
Date: Tue Aug 15 09:16:59 UTC 2017
Modified Files:
src/sys/arch/i386/i386: db_interface.c
src/sys/arch/xen/x86: xen_ipi.c
Log Message:
Remove unused arg, to have the same definition as amd64.
To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 src/sys/arch/i386/i386/db_interface.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/xen/x86/xen_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/i386/i386/db_interface.c
diff -u src/sys/arch/i386/i386/db_interface.c:1.73 src/sys/arch/i386/i386/db_interface.c:1.74
--- src/sys/arch/i386/i386/db_interface.c:1.73 Tue Aug 15 06:57:53 2017
+++ src/sys/arch/i386/i386/db_interface.c Tue Aug 15 09:16:59 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.c,v 1.73 2017/08/15 06:57:53 maxv Exp $ */
+/* $NetBSD: db_interface.c,v 1.74 2017/08/15 09:16:59 maxv Exp $ */
/*
* Mach Operating System
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.73 2017/08/15 06:57:53 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.74 2017/08/15 09:16:59 maxv Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
@@ -87,7 +87,7 @@ const struct db_command db_machine_comma
void kdbprinttrap(int, int);
#ifdef MULTIPROCESSOR
-extern void ddb_ipi(int, struct trapframe);
+extern void ddb_ipi(struct trapframe);
extern void ddb_ipi_tss(struct i386tss *);
static void ddb_suspend(struct trapframe *);
#ifndef XEN
@@ -299,7 +299,7 @@ cpu_Debugger(void)
* that the effect is as if the arguments were passed call by reference.
*/
void
-ddb_ipi(int cpl, struct trapframe frame)
+ddb_ipi(struct trapframe frame)
{
ddb_suspend(&frame);
Index: src/sys/arch/xen/x86/xen_ipi.c
diff -u src/sys/arch/xen/x86/xen_ipi.c:1.21 src/sys/arch/xen/x86/xen_ipi.c:1.22
--- src/sys/arch/xen/x86/xen_ipi.c:1.21 Sat Aug 12 07:21:57 2017
+++ src/sys/arch/xen/x86/xen_ipi.c Tue Aug 15 09:16:59 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: xen_ipi.c,v 1.21 2017/08/12 07:21:57 maxv Exp $ */
+/* $NetBSD: xen_ipi.c,v 1.22 2017/08/15 09:16:59 maxv Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -33,10 +33,10 @@
/*
* Based on: x86/ipi.c
- * __KERNEL_RCSID(0, "$NetBSD: xen_ipi.c,v 1.21 2017/08/12 07:21:57 maxv Exp $");
+ * __KERNEL_RCSID(0, "$NetBSD: xen_ipi.c,v 1.22 2017/08/15 09:16:59 maxv Exp $");
*/
-__KERNEL_RCSID(0, "$NetBSD: xen_ipi.c,v 1.21 2017/08/12 07:21:57 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xen_ipi.c,v 1.22 2017/08/15 09:16:59 maxv Exp $");
#include <sys/types.h>
@@ -59,11 +59,7 @@ __KERNEL_RCSID(0, "$NetBSD: xen_ipi.c,v
#include <xen/hypervisor.h>
#include <xen/xen-public/vcpu.h>
-#ifdef __x86_64__
extern void ddb_ipi(struct trapframe);
-#else
-extern void ddb_ipi(int, struct trapframe);
-#endif /* __x86_64__ */
static void xen_ipi_halt(struct cpu_info *, struct intrframe *);
static void xen_ipi_synch_fpu(struct cpu_info *, struct intrframe *);
@@ -254,7 +250,7 @@ xen_ipi_ddb(struct cpu_info *ci, struct
tf.tf_esp = intrf->if_esp;
tf.tf_ss = intrf->if_ss;
- ddb_ipi(SEL_KPL, tf);
+ ddb_ipi(tf);
#endif
}
