Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e76f4e6 authored by David Rientjes's avatar David Rientjes Committed by H. Peter Anvin
Browse files

x86, numa: Avoid compiling NUMA emulation functions without CONFIG_NUMA_EMU 



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: default avatarDavid Rientjes <rientjes@google.com>
LKML-Reference: <alpine.DEB.2.00.1012221701210.3701@chino.kir.corp.google.com>
Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent 34dc9e74

arch/x86/include/asm/acpi.h

+4 −1
Original line number Diff line number Diff line
@@ -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)

arch/x86/include/asm/amd_nb.h

+4 −1
Original line number Diff line number Diff line
@@ -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;

};

arch/x86/mm/amdtopology_64.c

+2 −0
Original line number Diff line number Diff line
@@ -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)

{

arch/x86/mm/srat_64.c

+2 −0
Original line number Diff line number Diff line
@@ -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)