Commit c710fcc5 authored by Dan Williams's avatar Dan Williams Committed by Rafael J. Wysocki
Browse files

ACPI: NUMA: Establish a new drivers/acpi/numa/ directory 



Currently hmat.c lives under an "hmat" directory which does not enhance
the description of the file. The initial motivation for giving hmat.c
its own directory was to delineate it as mm functionality in contrast to
ACPI device driver functionality.

As ACPI continues to play an increasing role in conveying
memory location and performance topology information to the OS take the
opportunity to co-locate these NUMA relevant tables in a combined
directory.

numa.c is renamed to srat.c and moved to drivers/acpi/numa/ along with
hmat.c.

Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
Reviewed-by: default avatarDave Hansen <dave.hansen@linux.intel.com>
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent a99d8080

drivers/acpi/Kconfig

+1 −8
Original line number Diff line number Diff line
@@ -319,12 +319,6 @@ config ACPI_THERMAL 
	  To compile this driver as a module, choose M here:

	  the module will be called thermal.



config ACPI_NUMA

	bool "NUMA support"

	depends on NUMA

	depends on (X86 || IA64 || ARM64)

	default y if IA64 || ARM64



config ACPI_CUSTOM_DSDT_FILE

	string "Custom DSDT Table file to include"

	default ""
@@ -473,8 +467,7 @@ config ACPI_REDUCED_HARDWARE_ONLY 
	  If you are unsure what to do, do not enable this option.



source "drivers/acpi/nfit/Kconfig"

source "drivers/acpi/hmat/Kconfig"



source "drivers/acpi/numa/Kconfig"

source "drivers/acpi/apei/Kconfig"

source "drivers/acpi/dptf/Kconfig"

drivers/acpi/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ acpi-$(CONFIG_X86) += acpi_cmos_rtc.o 
acpi-$(CONFIG_X86)		+= x86/apple.o

acpi-$(CONFIG_X86)		+= x86/utils.o

acpi-$(CONFIG_DEBUG_FS)		+= debugfs.o

acpi-$(CONFIG_ACPI_NUMA)	+= numa.o

acpi-$(CONFIG_ACPI_PROCFS_POWER) += cm_sbs.o

acpi-y				+= acpi_lpat.o

acpi-$(CONFIG_ACPI_LPIT)	+= acpi_lpit.o
@@ -80,7 +79,7 @@ obj-$(CONFIG_ACPI_PROCESSOR) += processor.o 
obj-$(CONFIG_ACPI)		+= container.o

obj-$(CONFIG_ACPI_THERMAL)	+= thermal.o

obj-$(CONFIG_ACPI_NFIT)		+= nfit/

obj-$(CONFIG_ACPI_HMAT)		+= hmat/

obj-$(CONFIG_ACPI_NUMA)		+= numa/

obj-$(CONFIG_ACPI)		+= acpi_memhotplug.o

obj-$(CONFIG_ACPI_HOTPLUG_IOAPIC) += ioapic.o

obj-$(CONFIG_ACPI_BATTERY)	+= battery.o

drivers/acpi/hmat/Kconfig→drivers/acpi/numa/Kconfig

+6 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

config ACPI_NUMA

	bool "NUMA support"

	depends on NUMA

	depends on (X86 || IA64 || ARM64)

	default y if IA64 || ARM64



config ACPI_HMAT

	bool "ACPI Heterogeneous Memory Attribute Table Support"

	depends on ACPI_NUMA

drivers/acpi/hmat/Makefile→drivers/acpi/numa/Makefile

+3 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

obj-$(CONFIG_ACPI_HMAT) := hmat.o
 
obj-$(CONFIG_ACPI_NUMA) += srat.o

obj-$(CONFIG_ACPI_HMAT) += hmat.o

drivers/acpi/hmat/hmat.c→drivers/acpi/numa/hmat.c

+0 −0

File moved.

View file

CRA Git | Maintained and supported by SUSTech CRA and CCSE