[Xen-changelog] [xen-unstable] [IA64] fix warning: "in_atomic" redefined

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User KUWAMURA Shin'ya <kuwa@xxxxxxxxxxxxxx>
# Date 1310804208 -3600
# Node ID dfb4fb612b5b400ebd2bb40516360f247578b362
# Parent  e238234f6cb02743438e426bf3c22a93a5a41279
[IA64] fix warning: "in_atomic" redefined

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

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


diff -r e238234f6cb0 -r dfb4fb612b5b 
xen/include/asm-ia64/linux-xen/linux/hardirq.h
--- a/xen/include/asm-ia64/linux-xen/linux/hardirq.h    Sat Jul 16 09:15:56 
2011 +0100
+++ b/xen/include/asm-ia64/linux-xen/linux/hardirq.h    Sat Jul 16 09:16:48 
2011 +0100
@@ -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-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog