lkml.org 
[lkml]   [2010]   [Nov]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 2/5] x86: avoid compiling NUMA emulation functions without CONFIG_NUMA_EMU
    Both acpi_get_nodes() and k8_get_nodes() are only necessary when
    CONFIG_NUMA_EMU is enabled, so avoid compiling them when the option is
    disabled.

    Signed-off-by: David Rientjes <rientjes@google.com>
    ---
    arch/x86/include/asm/acpi.h | 5 ++++-
    arch/x86/include/asm/amd_nb.h | 5 ++++-
    arch/x86/mm/k8topology_64.c | 2 ++
    arch/x86/mm/srat_64.c | 2 ++
    4 files changed, 12 insertions(+), 2 deletions(-)

    diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h
    --- a/arch/x86/include/asm/acpi.h
    +++ b/arch/x86/include/asm/acpi.h
    @@ -188,14 +188,17 @@ extern int acpi_numa;
    extern int acpi_get_nodes(struct bootnode *physnodes);
    extern int acpi_scan_nodes(unsigned long start, unsigned long end);
    #define NR_NODE_MEMBLKS (MAX_NUMNODES*2)
    +
    +#ifdef CONFIG_NUMA_EMU
    extern void acpi_fake_nodes(const struct bootnode *fake_nodes,
    int num_nodes);
    +#endif
    #else
    static inline void acpi_fake_nodes(const struct bootnode *fake_nodes,
    int num_nodes)
    {
    }
    -#endif
    +#endif /* CONFIG_ACPI_NUMA */

    #define acpi_unlazy_tlb(x) leave_mm(x)

    diff --git a/arch/x86/include/asm/amd_nb.h b/arch/x86/include/asm/amd_nb.h
    --- a/arch/x86/include/asm/amd_nb.h
    +++ b/arch/x86/include/asm/amd_nb.h
    @@ -9,10 +9,13 @@ struct bootnode;
    extern int early_is_k8_nb(u32 value);
    extern int cache_k8_northbridges(void);
    extern void k8_flush_garts(void);
    -extern int k8_get_nodes(struct bootnode *nodes);
    extern int k8_numa_init(unsigned long start_pfn, unsigned long end_pfn);
    extern int k8_scan_nodes(void);

    +#ifdef CONFIG_NUMA_EMU
    +extern int k8_get_nodes(struct bootnode *nodes);
    +#endif
    +
    struct k8_northbridge_info {
    u16 num;
    u8 gart_supported;
    diff --git a/arch/x86/mm/k8topology_64.c b/arch/x86/mm/k8topology_64.c
    --- a/arch/x86/mm/k8topology_64.c
    +++ b/arch/x86/mm/k8topology_64.c
    @@ -69,6 +69,7 @@ static __init void early_get_boot_cpu_id(void)
    early_init_lapic_mapping();
    }

    +#ifdef CONFIG_NUMA_EMU
    int __init k8_get_nodes(struct bootnode *physnodes)
    {
    int i;
    @@ -81,6 +82,7 @@ int __init k8_get_nodes(struct bootnode *physnodes)
    }
    return ret;
    }
    +#endif /* CONFIG_NUMA_EMU */

    int __init k8_numa_init(unsigned long start_pfn, unsigned long end_pfn)
    {
    diff --git a/arch/x86/mm/srat_64.c b/arch/x86/mm/srat_64.c
    --- a/arch/x86/mm/srat_64.c
    +++ b/arch/x86/mm/srat_64.c
    @@ -339,6 +339,7 @@ static int __init nodes_cover_memory(const struct bootnode *nodes)

    void __init acpi_numa_arch_fixup(void) {}

    +#ifdef CONFIG_NUMA_EMU
    int __init acpi_get_nodes(struct bootnode *physnodes)
    {
    int i;
    @@ -351,6 +352,7 @@ int __init acpi_get_nodes(struct bootnode *physnodes)
    }
    return ret;
    }
    +#endif /* CONFIG_NUMA_EMU */

    /* Use the information discovered above to actually set up the nodes. */
    int __init acpi_scan_nodes(unsigned long start, unsigned long end)

    \
     
     \ /
      Last update: 2010-11-12 22:57    [W:0.043 / U:0.068 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site