leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86, numa: Avoid compiling NUMA emulation functions without CONFIG_NUMA_EMU

Browse Source 
Both acpi_get_nodes() and amd_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>
LKML-Reference: <alpine.DEB.2.00.1012221701210.3701@chino.kir.corp.google.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
This commit is contained in:
David Rientjes 2010-12-22 17:23:47 -08:00 committed by H. Peter Anvin
parent 34dc9e7496
commit 4e76f4e67a
4 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/x86/include/asm/acpi.h
View File

@ -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)

5
arch/x86/include/asm/amd_nb.h
View File

@ -9,10 +9,13 @@ struct bootnode;
extern int early_is_amd_nb(u32 value);
extern int amd_cache_northbridges(void);
extern void amd_flush_garts(void);
extern int amd_get_nodes(struct bootnode *nodes);
extern int amd_numa_init(unsigned long start_pfn, unsigned long end_pfn);
extern int amd_scan_nodes(void);
#ifdef CONFIG_NUMA_EMU
extern int amd_get_nodes(struct bootnode *nodes);
#endif
struct amd_northbridge {
struct pci_dev *misc;
};

2
arch/x86/mm/amdtopology_64.c
View File

@ -69,6 +69,7 @@ static __init void early_get_boot_cpu_id(void)
early_init_lapic_mapping();
}
#ifdef CONFIG_NUMA_EMU
int __init amd_get_nodes(struct bootnode *physnodes)
{
int i;
@ -81,6 +82,7 @@ int __init amd_get_nodes(struct bootnode *physnodes)
}
return ret;
}
#endif /* CONFIG_NUMA_EMU */
int __init amd_numa_init(unsigned long start_pfn, unsigned long end_pfn)
{

2
arch/x86/mm/srat_64.c
View File

@ -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)