From: awilliam@xenbuild2.aw <awilliam@xenbuild2.aw>
Date: Wed, 10 Jan 2007 17:37:41 +0000 (-0700)
Subject: [IA64] Clean up build warnings
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15418
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=14ab6103b51bfb030cc2202b9c51e22c7991b19a;p=xen.git

[IA64] Clean up build warnings

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

diff --git a/xen/arch/ia64/linux-xen/cmdline.c b/xen/arch/ia64/linux-xen/cmdline.c
index b6dddcd808..48e6de1ccf 100644
--- a/xen/arch/ia64/linux-xen/cmdline.c
+++ b/xen/arch/ia64/linux-xen/cmdline.c
@@ -15,7 +15,9 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#ifdef XEN
 #include <xen/lib.h>
+#endif
 
 
 /**
@@ -38,7 +40,11 @@ int get_option (char **str, int *pint)
 
 	if (!cur || !(*cur))
 		return 0;
+#ifndef XEN
 	*pint = simple_strtol (cur, str, 0);
+#else
+	*pint = simple_strtol (cur, (const char**)str, 0);
+#endif
 	if (cur == *str)
 		return 0;
 	if (**str == ',') {
@@ -96,7 +102,11 @@ char *get_options(const char *str, int nints, int *ints)
 
 unsigned long long memparse (char *ptr, char **retptr)
 {
+#ifndef XEN
 	unsigned long long ret = simple_strtoull (ptr, retptr, 0);
+#else
+	unsigned long long ret = simple_strtoull (ptr, (const char**)retptr, 0);
+#endif
 
 	switch (**retptr) {
 	case 'G':