debuggers.hg

changeset 21030:bb7164fc680a

x86_32: Fix build after 20983:94535cc63835

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Fri Feb 26 08:13:02 2010 +0000 (2010-02-26)
parents 94535cc63835
children 82661c9ad896
files xen/arch/x86/srat.c
line diff
     1.1 --- a/xen/arch/x86/srat.c	Thu Feb 25 21:03:26 2010 +0000
     1.2 +++ b/xen/arch/x86/srat.c	Fri Feb 26 08:13:02 2010 +0000
     1.3 @@ -114,6 +114,7 @@ static __init void bad_srat(void)
     1.4  		apicid_to_node[i] = NUMA_NO_NODE;
     1.5  }
     1.6  
     1.7 +#ifdef CONFIG_X86_64
     1.8  /*
     1.9   * A lot of BIOS fill in 10 (= no distance) everywhere. This messes
    1.10   * up the NUMA heuristics which wants the local node to have a smaller
    1.11 @@ -140,7 +141,6 @@ static __init int slit_valid(struct acpi
    1.12  /* Callback for SLIT parsing */
    1.13  void __init acpi_numa_slit_init(struct acpi_table_slit *slit)
    1.14  {
    1.15 -#ifdef CONFIG_X86_64
    1.16  	unsigned long mfn;
    1.17  	if (!slit_valid(slit)) {
    1.18  		printk(KERN_INFO "ACPI: SLIT table looks invalid. "
    1.19 @@ -155,8 +155,12 @@ void __init acpi_numa_slit_init(struct a
    1.20  	}
    1.21  	acpi_slit = mfn_to_virt(mfn);
    1.22  	memcpy(acpi_slit, slit, slit->header.length);
    1.23 +}
    1.24 +#else
    1.25 +void __init acpi_numa_slit_init(struct acpi_table_slit *slit)
    1.26 +{
    1.27 +}
    1.28  #endif
    1.29 -}
    1.30  
    1.31  /* Callback for Proximity Domain -> LAPIC mapping */
    1.32  void __init