CVS commit: src/sys/arch/xen/x86

[Manuel Bouyer]

Module Name:    src
Committed By:   bouyer
Date:           Tue Jul 24 12:26:14 UTC 2018

Modified Files:
        src/sys/arch/xen/x86: xen_ipi.c

Log Message:
Fix what looks like a typo in xen_send_ipi():
ci != NULL || ci != curcpu()
is always true


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 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.25 src/sys/arch/xen/x86/xen_ipi.c:1.26
--- src/sys/arch/xen/x86/xen_ipi.c:1.25	Sun Jun 24 13:35:32 2018
+++ src/sys/arch/xen/x86/xen_ipi.c	Tue Jul 24 12:26:14 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: xen_ipi.c,v 1.25 2018/06/24 13:35:32 jdolecek Exp $ */
+/* $NetBSD: xen_ipi.c,v 1.26 2018/07/24 12:26:14 bouyer 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.25 2018/06/24 13:35:32 jdolecek Exp $");
+ * __KERNEL_RCSID(0, "$NetBSD: xen_ipi.c,v 1.26 2018/07/24 12:26:14 bouyer Exp $");
  */
 
-__KERNEL_RCSID(0, "$NetBSD: xen_ipi.c,v 1.25 2018/06/24 13:35:32 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xen_ipi.c,v 1.26 2018/07/24 12:26:14 bouyer Exp $");
 
 #include "opt_ddb.h"
 
@@ -168,7 +168,7 @@ xen_send_ipi(struct cpu_info *ci, uint32
 {
 	evtchn_port_t evtchn;
 
-	KASSERT(ci != NULL || ci != curcpu());
+	KASSERT(ci != NULL && ci != curcpu());
 
 	if ((ci->ci_flags & CPUF_RUNNING) == 0) {
 		return ENOENT;