Skip to content

Commit c710fcc

Browse files
djbwrafaeljw
authored andcommitted
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: Dan Williams <[email protected]> Reviewed-by: Dave Hansen <[email protected]> Acked-by: Thomas Gleixner <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]>
1 parent a99d808 commit c710fcc

File tree

7 files changed

+11
-12
lines changed

7 files changed

+11
-12
lines changed

drivers/acpi/Kconfig

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -319,12 +319,6 @@ config ACPI_THERMAL
319319
To compile this driver as a module, choose M here:
320320
the module will be called thermal.
321321

322-
config ACPI_NUMA
323-
bool "NUMA support"
324-
depends on NUMA
325-
depends on (X86 || IA64 || ARM64)
326-
default y if IA64 || ARM64
327-
328322
config ACPI_CUSTOM_DSDT_FILE
329323
string "Custom DSDT Table file to include"
330324
default ""
@@ -473,8 +467,7 @@ config ACPI_REDUCED_HARDWARE_ONLY
473467
If you are unsure what to do, do not enable this option.
474468

475469
source "drivers/acpi/nfit/Kconfig"
476-
source "drivers/acpi/hmat/Kconfig"
477-
470+
source "drivers/acpi/numa/Kconfig"
478471
source "drivers/acpi/apei/Kconfig"
479472
source "drivers/acpi/dptf/Kconfig"
480473

drivers/acpi/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ acpi-$(CONFIG_X86) += acpi_cmos_rtc.o
5555
acpi-$(CONFIG_X86) += x86/apple.o
5656
acpi-$(CONFIG_X86) += x86/utils.o
5757
acpi-$(CONFIG_DEBUG_FS) += debugfs.o
58-
acpi-$(CONFIG_ACPI_NUMA) += numa.o
5958
acpi-$(CONFIG_ACPI_PROCFS_POWER) += cm_sbs.o
6059
acpi-y += acpi_lpat.o
6160
acpi-$(CONFIG_ACPI_LPIT) += acpi_lpit.o
@@ -80,7 +79,7 @@ obj-$(CONFIG_ACPI_PROCESSOR) += processor.o
8079
obj-$(CONFIG_ACPI) += container.o
8180
obj-$(CONFIG_ACPI_THERMAL) += thermal.o
8281
obj-$(CONFIG_ACPI_NFIT) += nfit/
83-
obj-$(CONFIG_ACPI_HMAT) += hmat/
82+
obj-$(CONFIG_ACPI_NUMA) += numa/
8483
obj-$(CONFIG_ACPI) += acpi_memhotplug.o
8584
obj-$(CONFIG_ACPI_HOTPLUG_IOAPIC) += ioapic.o
8685
obj-$(CONFIG_ACPI_BATTERY) += battery.o

drivers/acpi/hmat/Makefile

Lines changed: 0 additions & 2 deletions
This file was deleted.

drivers/acpi/hmat/Kconfig renamed to drivers/acpi/numa/Kconfig

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11
# SPDX-License-Identifier: GPL-2.0
2+
config ACPI_NUMA
3+
bool "NUMA support"
4+
depends on NUMA
5+
depends on (X86 || IA64 || ARM64)
6+
default y if IA64 || ARM64
7+
28
config ACPI_HMAT
39
bool "ACPI Heterogeneous Memory Attribute Table Support"
410
depends on ACPI_NUMA

drivers/acpi/numa/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
2+
obj-$(CONFIG_ACPI_NUMA) += srat.o
3+
obj-$(CONFIG_ACPI_HMAT) += hmat.o
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)