Module Name: src
Committed By: cherry
Date: Wed Dec 28 18:59:21 UTC 2011
Modified Files:
src/sys/arch/xen/x86: xen_ipi.c
Log Message:
Remove temporary variable definition that is unused in non DIAGNOSTIC builds.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 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/xen/x86/xen_ipi.c
diff -u src/sys/arch/xen/x86/xen_ipi.c:1.7 src/sys/arch/xen/x86/xen_ipi.c:1.8
--- src/sys/arch/xen/x86/xen_ipi.c:1.7 Wed Dec 7 15:47:43 2011
+++ src/sys/arch/xen/x86/xen_ipi.c Wed Dec 28 18:59:21 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: xen_ipi.c,v 1.7 2011/12/07 15:47:43 cegger Exp $ */
+/* $NetBSD: xen_ipi.c,v 1.8 2011/12/28 18:59:21 cherry 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.7 2011/12/07 15:47:43 cegger Exp $");
+ * __KERNEL_RCSID(0, "$NetBSD: xen_ipi.c,v 1.8 2011/12/28 18:59:21 cherry Exp $");
*/
-__KERNEL_RCSID(0, "$NetBSD: xen_ipi.c,v 1.7 2011/12/07 15:47:43 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xen_ipi.c,v 1.8 2011/12/28 18:59:21 cherry Exp $");
#include <sys/types.h>
@@ -304,10 +304,8 @@ xen_ipi_hvcb(struct cpu_info *ci, struct
{
KASSERT(ci != NULL);
KASSERT(intrf != NULL);
-
- volatile struct vcpu_info *vci = ci->ci_vcpu;
-
KASSERT(ci == curcpu());
- KASSERT(!vci->evtchn_upcall_mask);
+ KASSERT(!ci->ci_vcpu->evtchn_upcall_mask);
+
hypervisor_force_callback();
}
