[src/netbsd-7]: src/sys/arch/xen/x86 Pull up following revision(s) (requested...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d807e066ae4c
branches:  netbsd-7
changeset: 798964:d807e066ae4c
user:      snj <snj%NetBSD.org@localhost>
date:      Sun Feb 08 22:18:30 2015 +0000

description:
Pull up following revision(s) (requested by joerg in ticket #498):
        sys/arch/xen/x86/xen_ipi.c: revision 1.19
valid_ipimask is only used under DIAGNOSTIC, so only define it then.

diffstat:

 sys/arch/xen/x86/xen_ipi.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (38 lines):

diff -r f2157c5a6a81 -r d807e066ae4c sys/arch/xen/x86/xen_ipi.c
--- a/sys/arch/xen/x86/xen_ipi.c        Sun Feb 08 22:15:02 2015 +0000
+++ b/sys/arch/xen/x86/xen_ipi.c        Sun Feb 08 22:18:30 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: xen_ipi.c,v 1.18 2014/05/19 22:47:54 rmind Exp $ */
+/* $NetBSD: xen_ipi.c,v 1.18.2.1 2015/02/08 22:18:30 snj 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.18 2014/05/19 22:47:54 rmind Exp $"); 
+ * __KERNEL_RCSID(0, "$NetBSD: xen_ipi.c,v 1.18.2.1 2015/02/08 22:18:30 snj Exp $"); 
  */
 
-__KERNEL_RCSID(0, "$NetBSD: xen_ipi.c,v 1.18 2014/05/19 22:47:54 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xen_ipi.c,v 1.18.2.1 2015/02/08 22:18:30 snj Exp $");
 
 #include <sys/types.h>
 
@@ -131,6 +131,7 @@
        hypervisor_enable_event(evtchn);
 }
 
+#ifdef DIAGNOSTIC
 static inline bool /* helper */
 valid_ipimask(uint32_t ipimask)
 {
@@ -145,6 +146,7 @@
        }
 
 }
+#endif
 
 int
 xen_send_ipi(struct cpu_info *ci, uint32_t ipimask)