From mboxrd@z Thu Jan  1 00:00:00 1970
From: Alex Williamson <alex.williamson@hp.com>
Subject: [PATCH] ia64 build fixes
Date: Mon, 13 Mar 2006 21:56:15 -0700
Message-ID: <1142312175.27381.10.camel@localhost>
Mime-Version: 1.0
Content-Type: text/plain
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xensource.com>
List-Unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: Keir Fraser <Keir.Fraser@cl.cam.ac.uk>
Cc: xen-devel <xen-devel@lists.xensource.com>, xen-ia64-devel <xen-ia64-devel@lists.xensource.com>
List-Id: xen-devel@lists.xenproject.org

Keir,

   The patch below is necessary to get ia64 building on current
xen-unstable.hg.  Thanks,

	Alex

Signed-off-by: Alex Williamson <alex.williamson@hp.com>
---

diff -r 3983e4f1b054 xen/arch/ia64/Rules.mk
--- a/xen/arch/ia64/Rules.mk	Sun Mar 12 10:03:33 2006 +0100
+++ b/xen/arch/ia64/Rules.mk	Mon Mar 13 09:36:01 2006 -0700
@@ -12,7 +12,7 @@ CPPFLAGS  += -I$(BASEDIR)/include -I$(BA
 	     -I$(BASEDIR)/include/asm-ia64/linux-null 			\
              -I$(BASEDIR)/arch/ia64/linux -I$(BASEDIR)/arch/ia64/linux-xen
 
-CFLAGS  := -nostdinc -fno-builtin -fno-common -fno-strict-aliasing
+CFLAGS  += -nostdinc -fno-builtin -fno-common -fno-strict-aliasing
 #CFLAGS  += -O3		# -O3 over-inlines making debugging tough!
 CFLAGS  += -O2		# but no optimization causes compile errors!
 #CFLAGS  += -iwithprefix include -Wall -DMONITOR_BASE=$(MONITOR_BASE)
diff -r 3983e4f1b054 xen/include/asm-ia64/xensystem.h
--- a/xen/include/asm-ia64/xensystem.h	Sun Mar 12 10:03:33 2006 +0100
+++ b/xen/include/asm-ia64/xensystem.h	Mon Mar 13 09:36:02 2006 -0700
@@ -75,5 +75,7 @@ extern struct task_struct *vmx_ia64_swit
 // FIXME SMP... see system.h, does this need to be different?
 #define switch_to(prev,next,last)	__switch_to(prev, next, last)
 
+#define local_irq_is_enabled() (!irqs_disabled())
+
 #endif // __ASSEMBLY__
 #endif // _ASM_IA64_XENSYSTEM_H