xen-changelog

[Top] [All Lists]

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

from [Xen patchbot-unstable]

[Permanent Link][Original]

To:	xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject:	[Xen-changelog] [xen-unstable] [IA64] fix warning: "in_atomic" redefined
From:	Xen patchbot-unstable <patchbot@xxxxxxx>
Date:	Sun, 17 Jul 2011 12:55:13 +0100
Delivery-date:	Sun, 17 Jul 2011 04:56:43 -0700
Envelope-to:	www-data@xxxxxxxxxxxxxxxxxxx
List-help:	<mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id:	BK change log <xen-changelog.lists.xensource.com>
List-post:	<mailto:xen-changelog@lists.xensource.com>
List-subscribe:	<http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe:	<http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to:	xen-devel@xxxxxxxxxxxxxxxxxxx
Sender:	xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx

# 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

[More with this subject...]

<Prev in Thread]	Current Thread	[Next in Thread>
[Xen-changelog] [xen-unstable] [IA64] fix warning: "in_atomic" redefined, Xen patchbot-unstable <=

Previous by Date:	[Xen-changelog] [xen-unstable] xen/irq: Make it obvious that desc->status fields comprise a bitfield., Xen patchbot-unstable
Next by Date:	[Xen-changelog] [xen-unstable] libxc: remove obsolete comment., Xen patchbot-unstable
Previous by Thread:	[Xen-changelog] [xen-unstable] xen/irq: Make it obvious that desc->status fields comprise a bitfield., Xen patchbot-unstable
Next by Thread:	[Xen-changelog] [xen-unstable] libxc: remove obsolete comment., Xen patchbot-unstable
Indexes:	[Date] [Thread] [Top] [All Lists]