[Xen-devel] [PATCH] [IA64] fix warning: "in_atomic" redefined

["KUWAMURA Shin'ya" <kuwa@xxxxxxxxxxxxxx>]

Hi,

This patch fixes `warning: "in_atomic" redefined'.
# It is introduced by 22395:deb438d43e79.

Signed-off-by: KUWAMURA Shin'ya <kuwa@xxxxxxxxxxxxxx>
-- 
  KUWAMURA Shin'ya

# HG changeset patch
# User KUWAMURA Shin'ya <kuwa@xxxxxxxxxxxxxx>
# Date 1310706822 -32400
# Node ID d919e7b49ec28c85ff6e87c0cdd4b465ebf5fc0b
# Parent  deb438d43e79943643914f708b37354dc53f79f4
[IA64] fix warning: "in_atomic" redefined

This warning is introduced by 22395:deb438d43e79.

Signed-off-by: KUWAMURA Shin'ya <kuwa@xxxxxxxxxxxxxx>

diff -r deb438d43e79 -r d919e7b49ec2 
xen/include/asm-ia64/linux-xen/linux/hardirq.h
--- a/xen/include/asm-ia64/linux-xen/linux/hardirq.h    Tue Nov 16 15:41:28 
2010 +0000
+++ b/xen/include/asm-ia64/linux-xen/linux/hardirq.h    Fri Jul 15 14:13:42 
2011 +0900
@@ -69,11 +69,13 @@
 #define in_softirq()           (softirq_count())
 #define in_interrupt()         (irq_count())
 
+#ifndef XEN
 #if defined(CONFIG_PREEMPT) && !defined(CONFIG_PREEMPT_BKL)
 # define in_atomic()   ((preempt_count() & ~PREEMPT_ACTIVE) != kernel_locked())
 #else
 # define in_atomic()   ((preempt_count() & ~PREEMPT_ACTIVE) != 0)
 #endif
+#endif
 
 #ifdef CONFIG_PREEMPT
 # define preemptible() (preempt_count() == 0 && !irqs_disabled())

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel