From: awilliam@xenbuild2.aw <awilliam@xenbuild2.aw>
Date: Sun, 4 Feb 2007 19:06:59 +0000 (-0700)
Subject: [IA64] Xen build warning fixes
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15360
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d11e9be9c47b95bb7278f090d4dd24e35ac73c47;p=xen.git

[IA64] Xen build warning fixes

Missing include and remove an sprintf

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

diff --git a/xen/arch/ia64/xen/xensetup.c b/xen/arch/ia64/xen/xensetup.c
index 84a93d5046..37de379e2a 100644
--- a/xen/arch/ia64/xen/xensetup.c
+++ b/xen/arch/ia64/xen/xensetup.c
@@ -27,6 +27,7 @@
 #include <linux/efi.h>
 #include <asm/iosapic.h>
 #include <xen/softirq.h>
+#include <xen/rcupdate.h>
 
 unsigned long xenheap_phys_end, total_pages;
 
diff --git a/xen/include/asm-ia64/linux-xen/linux/efi.h b/xen/include/asm-ia64/linux-xen/linux/efi.h
index 73781ec165..2eb12715a1 100644
--- a/xen/include/asm-ia64/linux-xen/linux/efi.h
+++ b/xen/include/asm-ia64/linux-xen/linux/efi.h
@@ -280,7 +280,11 @@ efi_guidcmp (efi_guid_t left, efi_guid_t right)
 static inline char *
 efi_guid_unparse(efi_guid_t *guid, char *out)
 {
+#ifndef XEN
 	sprintf(out, "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
+#else
+	snprintf(out, 37, "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
+#endif
 		guid->b[3], guid->b[2], guid->b[1], guid->b[0],
 		guid->b[5], guid->b[4], guid->b[7], guid->b[6],
 		guid->b[8], guid->b[9], guid->b[10], guid->b[11],