ia64/xen-unstable

changeset 5159:c62ee1a8ba98

bitkeeper revision 1.1557 (4294b94bIF7VSJm4DWqLidHZJXHecQ)

x86/64 build fixes.
Signed-off-by: Keir Fraser <keir@xensource.com>
author kaf24@firebug.cl.cam.ac.uk
date Wed May 25 17:43:39 2005 +0000 (2005-05-25)
parents 519428a32f8d
children e82fb753b02f
files xen/arch/x86/x86_64/traps.c xen/arch/x86/x86_64/usercopy.c xen/include/asm-x86/mach-es7000/mach_mpparse.h xen/include/xen/dmi.h
line diff
     1.1 --- a/xen/arch/x86/x86_64/traps.c	Wed May 25 17:39:23 2005 +0000
     1.2 +++ b/xen/arch/x86/x86_64/traps.c	Wed May 25 17:43:39 2005 +0000
     1.3 @@ -8,6 +8,7 @@
     1.4  #include <xen/irq.h>
     1.5  #include <xen/console.h>
     1.6  #include <xen/sched.h>
     1.7 +#include <asm/flushtlb.h>
     1.8  #include <asm/msr.h>
     1.9  
    1.10  void show_registers(struct cpu_user_regs *regs)
     2.1 --- a/xen/arch/x86/x86_64/usercopy.c	Wed May 25 17:39:23 2005 +0000
     2.2 +++ b/xen/arch/x86/x86_64/usercopy.c	Wed May 25 17:43:39 2005 +0000
     2.3 @@ -5,6 +5,8 @@
     2.4   * Copyright 1997 Linus Torvalds
     2.5   * Copyright 2002 Andi Kleen <ak@suse.de>
     2.6   */
     2.7 +
     2.8 +#include <xen/string.h>
     2.9  #include <asm/uaccess.h>
    2.10  
    2.11  /*
     3.1 --- a/xen/include/asm-x86/mach-es7000/mach_mpparse.h	Wed May 25 17:39:23 2005 +0000
     3.2 +++ b/xen/include/asm-x86/mach-es7000/mach_mpparse.h	Wed May 25 17:43:39 2005 +0000
     3.3 @@ -20,7 +20,7 @@ static inline int mps_oem_check(struct m
     3.4  {
     3.5  	if (mpc->mpc_oemptr) {
     3.6  		struct mp_config_oemtable *oem_table = 
     3.7 -			(struct mp_config_oemtable *)mpc->mpc_oemptr;
     3.8 +			(struct mp_config_oemtable *)(long)mpc->mpc_oemptr;
     3.9  		if (!strncmp(oem, "UNISYS", 6))
    3.10  			return parse_unisys_oem((char *)oem_table, oem_table->oem_length);
    3.11  	}
     4.1 --- a/xen/include/xen/dmi.h	Wed May 25 17:39:23 2005 +0000
     4.2 +++ b/xen/include/xen/dmi.h	Wed May 25 17:43:39 2005 +0000
     4.3 @@ -32,16 +32,7 @@ struct dmi_system_id {
     4.4  
     4.5  #define DMI_MATCH(a,b)	{ a, b }
     4.6  
     4.7 -#if defined(CONFIG_X86) && !defined(CONFIG_X86_64)
     4.8 -
     4.9  extern int dmi_check_system(struct dmi_system_id *list);
    4.10  extern char * dmi_get_system_info(int field);
    4.11  
    4.12 -#else
    4.13 -
    4.14 -static inline int dmi_check_system(struct dmi_system_id *list) { return 0; }
    4.15 -static inline char * dmi_get_system_info(int field) { return NULL; }
    4.16 -
    4.17 -#endif
    4.18 -
    4.19  #endif	/* __DMI_H__ */