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

Commit e84025e2 authored by David Daney's avatar David Daney Committed by Rafael J. Wysocki
Browse files

ACPI / NUMA: move bad_srat() and srat_disabled() to drivers/acpi/numa.c 



bad_srat() and srat_disabled() are shared by x86 and follow-on arm64
patches.  Move them to drivers/acpi/numa.c in preparation for arm64
support.

Signed-off-by: default avatarHanjun Guo <hanjun.guo@linaro.org>
Signed-off-by: default avatarRobert Richter <rrichter@cavium.com>
[david.daney@cavium.com moved definitions to drivers/acpi/numa.c]
Signed-off-by: default avatarDavid Daney <david.daney@cavium.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 2faeff1d

arch/x86/include/asm/acpi.h

+0 −1
Original line number Diff line number Diff line
@@ -145,7 +145,6 @@ static inline void disable_acpi(void) { } 
#define ARCH_HAS_POWER_INIT	1



#ifdef CONFIG_ACPI_NUMA

extern int acpi_numa;

extern int x86_acpi_numa_init(void);

#endif /* CONFIG_ACPI_NUMA */

arch/x86/mm/numa.c

+1 −1
Original line number Diff line number Diff line 
/* Common code for 32 and 64-bit NUMA */

#include <linux/acpi.h>

#include <linux/kernel.h>

#include <linux/mm.h>

#include <linux/string.h>
@@ -15,7 +16,6 @@ 
#include <asm/e820.h>

#include <asm/proto.h>

#include <asm/dma.h>

#include <asm/acpi.h>

#include <asm/amd_nb.h>



#include "numa_internal.h"

arch/x86/mm/srat.c

+0 −13
Original line number Diff line number Diff line
@@ -24,19 +24,6 @@ 
#include <asm/apic.h>

#include <asm/uv/uv.h>



int acpi_numa __initdata;



static __init void bad_srat(void)

{

	printk(KERN_ERR "SRAT: SRAT not used.\n");

	acpi_numa = -1;

}



static __init inline int srat_disabled(void)

{

	return acpi_numa < 0;

}



/* Callback for Proximity Domain -> x2APIC mapping */

void __init

acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa)

drivers/acpi/numa.c

+12 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ static int node_to_pxm_map[MAX_NUMNODES] 
			= { [0 ... MAX_NUMNODES - 1] = PXM_INVAL };



unsigned char acpi_srat_revision __initdata;

int acpi_numa __initdata;



int pxm_to_node(int pxm)

{
@@ -197,6 +198,17 @@ static int __init slit_valid(struct acpi_table_slit *slit) 
	return 1;

}



void __init bad_srat(void)

{

	pr_err("SRAT: SRAT not used.\n");

	acpi_numa = -1;

}



int __init srat_disabled(void)

{

	return acpi_numa < 0;

}



#if defined(CONFIG_X86) || defined(CONFIG_ARM64)

/*

 * Callback for SLIT parsing.  pxm_to_node() returns NUMA_NO_NODE for

include/acpi/acpi_numa.h

+4 −0
Original line number Diff line number Diff line
@@ -15,6 +15,10 @@ extern int pxm_to_node(int); 
extern int node_to_pxm(int);

extern int acpi_map_pxm_to_node(int);

extern unsigned char acpi_srat_revision;

extern int acpi_numa __initdata;



extern void bad_srat(void);

extern int srat_disabled(void);



#endif				/* CONFIG_ACPI_NUMA */

#endif				/* __ACP_NUMA_H */