Hi,
>>>>> On Mon, 01 Nov 2010 09:48:41 +0000
>>>>> keir@xxxxxxx(Keir Fraser) said:
>
> On 01/11/2010 09:28, "Ian Campbell" <Ian.Campbell@xxxxxxxxxxxxx> wrote:
>
> >> I'll apply this if IanC finds it acceptable.
> >
> > Subject to the addition of a license boiler plate at the top of
> > ltools/libxc/ia64/ac_ia64_tools.h, either the LGPLv2 one used through
> > out libxc or something compatible, it is fine with me.
>
> Please fix that and then I will apply the patch.
I added LGPLv2 license boiler plate.
Best regards,
--
KUWAMURA Shin'ya
# HG changeset patch
# User KUWAMURA Shin'ya <kuwa@xxxxxxxxxxxxxx>
# Date 1288657800 -32400
# Node ID 6f6ab71e600e48ed5bfc05c313cef1a7263e1e83
# Parent bbffb400f50787e334ed11301119f702fa146e12
Fix ia64 tools build
22066:eccfdeb41b80 replaced tools/libxc/ia64/aclinux.h with
xen/include/acpi/platform/aclinux.h.
Because both are incompatible, tools cannot be built on ia64.
This patch fixes compilation errors by defining identifiers at
ac_ia64_tools.h.
Signed-off-by: KUWAMURA Shin'ya <kuwa@xxxxxxxxxxxxxx>
diff -r bbffb400f507 -r 6f6ab71e600e tools/libxc/ia64/ac_ia64_tools.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tools/libxc/ia64/ac_ia64_tools.h Tue Nov 02 09:30:00 2010 +0900
@@ -0,0 +1,46 @@
+/*
+ * ac_ia64_tools.h
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
+ *
+ */
+
+#ifndef AC_IA64_TOOLS_H
+#define AC_IA64_TOOLS_H
+
+#define ACPI_MACHINE_WIDTH 64
+#define COMPILER_DEPENDENT_UINT64 unsigned long long
+#define COMPILER_DEPENDENT_INT64 long long
+typedef unsigned long long u64;
+typedef long long s64;
+typedef unsigned u32;
+typedef int s32;
+typedef unsigned char u8;
+typedef unsigned short u16;
+#define __iomem
+#define asmlinkage
+#define CONFIG_ACPI_BOOT
+
+#endif /* AC_IA64_TOOLS_H */
+
+/*
+ * Local variables:
+ * mode: C
+ * c-set-style: "BSD"
+ * c-basic-offset: 4
+ * tab-width: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
diff -r bbffb400f507 -r 6f6ab71e600e xen/include/acpi/platform/acenv.h
--- a/xen/include/acpi/platform/acenv.h Mon Nov 01 15:35:03 2010 +0900
+++ b/xen/include/acpi/platform/acenv.h Tue Nov 02 09:30:00 2010 +0900
@@ -136,7 +136,9 @@
/*! [Begin] no source code translation */
-#if 1/*defined(_LINUX) || defined(__linux__)*/
+#if defined(__XEN_TOOLS__) && defined(__ia64__)
+#include "ac_ia64_tools.h"
+#elif 1 /*defined(_LINUX) || defined(__linux__)*/
#include "aclinux.h"
#elif defined(_AED_EFI)
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
Home