ChangeSet 1.1557, 2005/05/25 18:43:39+01:00, kaf24@xxxxxxxxxxxxxxxxxxxx
x86/64 build fixes.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
arch/x86/x86_64/traps.c | 1 +
arch/x86/x86_64/usercopy.c | 2 ++
include/asm-x86/mach-es7000/mach_mpparse.h | 2 +-
include/xen/dmi.h | 9 ---------
4 files changed, 4 insertions(+), 10 deletions(-)
diff -Nru a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c
--- a/xen/arch/x86/x86_64/traps.c 2005-05-25 14:02:51 -04:00
+++ b/xen/arch/x86/x86_64/traps.c 2005-05-25 14:02:51 -04:00
@@ -8,6 +8,7 @@
#include <xen/irq.h>
#include <xen/console.h>
#include <xen/sched.h>
+#include <asm/flushtlb.h>
#include <asm/msr.h>
void show_registers(struct cpu_user_regs *regs)
diff -Nru a/xen/arch/x86/x86_64/usercopy.c b/xen/arch/x86/x86_64/usercopy.c
--- a/xen/arch/x86/x86_64/usercopy.c 2005-05-25 14:02:51 -04:00
+++ b/xen/arch/x86/x86_64/usercopy.c 2005-05-25 14:02:51 -04:00
@@ -5,6 +5,8 @@
* Copyright 1997 Linus Torvalds
* Copyright 2002 Andi Kleen <ak@xxxxxxx>
*/
+
+#include <xen/string.h>
#include <asm/uaccess.h>
/*
diff -Nru a/xen/include/asm-x86/mach-es7000/mach_mpparse.h
b/xen/include/asm-x86/mach-es7000/mach_mpparse.h
--- a/xen/include/asm-x86/mach-es7000/mach_mpparse.h 2005-05-25 14:02:51
-04:00
+++ b/xen/include/asm-x86/mach-es7000/mach_mpparse.h 2005-05-25 14:02:51
-04:00
@@ -20,7 +20,7 @@
{
if (mpc->mpc_oemptr) {
struct mp_config_oemtable *oem_table =
- (struct mp_config_oemtable *)mpc->mpc_oemptr;
+ (struct mp_config_oemtable *)(long)mpc->mpc_oemptr;
if (!strncmp(oem, "UNISYS", 6))
return parse_unisys_oem((char *)oem_table,
oem_table->oem_length);
}
diff -Nru a/xen/include/xen/dmi.h b/xen/include/xen/dmi.h
--- a/xen/include/xen/dmi.h 2005-05-25 14:02:51 -04:00
+++ b/xen/include/xen/dmi.h 2005-05-25 14:02:51 -04:00
@@ -32,16 +32,7 @@
#define DMI_MATCH(a,b) { a, b }
-#if defined(CONFIG_X86) && !defined(CONFIG_X86_64)
-
extern int dmi_check_system(struct dmi_system_id *list);
extern char * dmi_get_system_info(int field);
-
-#else
-
-static inline int dmi_check_system(struct dmi_system_id *list) { return 0; }
-static inline char * dmi_get_system_info(int field) { return NULL; }
-
-#endif
#endif /* __DMI_H__ */
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home