Skip to contentSkip to conversation

ia64 build fixes

PATCH New Alex Williamson 1 participant 1 message Mar 14, 2006

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ia64 build fixes

Keir,

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

Alex

---

xen/arch/ia64/Rules.mk +1 -1
diff -r 3983e4f1b054 xen/arch/ia64/Rules.mk
@@ -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)
xen/include/asm-ia64/xensystem.h +2 -0
diff -r 3983e4f1b054 xen/include/asm-ia64/xensystem.h
@@ -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