tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

nfit: move to nfit/ sub-directory

With the arrival of x86-machine-check support the nfit driver will add a
(conditionally-compiled) source file. Prepare for this by moving all
nfit source to drivers/acpi/nfit/. This is pure code movement, no
functional changes.

Signed-off-by: Dan Williams <dan.j.williams@intel.com>

Dan Williams bdf97013 37b137ff

+33 -30
+1 -26
drivers/acpi/Kconfig
··· 447 447 448 448 If you are unsure what to do, do not enable this option. 449 449 450 - config ACPI_NFIT 451 - tristate "ACPI NVDIMM Firmware Interface Table (NFIT)" 452 - depends on PHYS_ADDR_T_64BIT 453 - depends on BLK_DEV 454 - depends on ARCH_HAS_MMIO_FLUSH 455 - select LIBNVDIMM 456 - help 457 - Infrastructure to probe ACPI 6 compliant platforms for 458 - NVDIMMs (NFIT) and register a libnvdimm device tree. In 459 - addition to storage devices this also enables libnvdimm to pass 460 - ACPI._DSM messages for platform/dimm configuration. 461 - 462 - To compile this driver as a module, choose M here: 463 - the module will be called nfit. 464 - 465 - config ACPI_NFIT_DEBUG 466 - bool "NFIT DSM debug" 467 - depends on ACPI_NFIT 468 - depends on DYNAMIC_DEBUG 469 - default n 470 - help 471 - Enabling this option causes the nfit driver to dump the 472 - input and output buffers of _DSM operations on the ACPI0012 473 - device and its children. This can be very verbose, so leave 474 - it disabled unless you are debugging a hardware / firmware 475 - issue. 450 + source "drivers/acpi/nfit/Kconfig" 476 451 477 452 source "drivers/acpi/apei/Kconfig" 478 453
+1 -1
drivers/acpi/Makefile
··· 70 70 obj-$(CONFIG_ACPI_PROCESSOR) += processor.o 71 71 obj-$(CONFIG_ACPI) += container.o 72 72 obj-$(CONFIG_ACPI_THERMAL) += thermal.o 73 - obj-$(CONFIG_ACPI_NFIT) += nfit.o 73 + obj-$(CONFIG_ACPI_NFIT) += nfit/ 74 74 obj-$(CONFIG_ACPI) += acpi_memhotplug.o 75 75 obj-$(CONFIG_ACPI_HOTPLUG_IOAPIC) += ioapic.o 76 76 obj-$(CONFIG_ACPI_BATTERY) += battery.o
drivers/acpi/nfit.c drivers/acpi/nfit/core.c
drivers/acpi/nfit.h drivers/acpi/nfit/nfit.h
+26
drivers/acpi/nfit/Kconfig
··· 1 + config ACPI_NFIT 2 + tristate "ACPI NVDIMM Firmware Interface Table (NFIT)" 3 + depends on PHYS_ADDR_T_64BIT 4 + depends on BLK_DEV 5 + depends on ARCH_HAS_MMIO_FLUSH 6 + select LIBNVDIMM 7 + help 8 + Infrastructure to probe ACPI 6 compliant platforms for 9 + NVDIMMs (NFIT) and register a libnvdimm device tree. In 10 + addition to storage devices this also enables libnvdimm to pass 11 + ACPI._DSM messages for platform/dimm configuration. 12 + 13 + To compile this driver as a module, choose M here: 14 + the module will be called nfit. 15 + 16 + config ACPI_NFIT_DEBUG 17 + bool "NFIT DSM debug" 18 + depends on ACPI_NFIT 19 + depends on DYNAMIC_DEBUG 20 + default n 21 + help 22 + Enabling this option causes the nfit driver to dump the 23 + input and output buffers of _DSM operations on the ACPI0012 24 + device and its children. This can be very verbose, so leave 25 + it disabled unless you are debugging a hardware / firmware 26 + issue.
+2
drivers/acpi/nfit/Makefile
··· 1 + obj-$(CONFIG_ACPI_NFIT) := nfit.o 2 + nfit-y := core.o
+2 -2
tools/testing/nvdimm/Kbuild
··· 16 16 17 17 DRIVERS := ../../../drivers 18 18 NVDIMM_SRC := $(DRIVERS)/nvdimm 19 - ACPI_SRC := $(DRIVERS)/acpi 19 + ACPI_SRC := $(DRIVERS)/acpi/nfit 20 20 DAX_SRC := $(DRIVERS)/dax 21 21 ccflags-y := -I$(src)/$(NVDIMM_SRC)/ 22 22 ··· 29 29 obj-$(CONFIG_DEV_DAX) += dax.o 30 30 obj-$(CONFIG_DEV_DAX_PMEM) += dax_pmem.o 31 31 32 - nfit-y := $(ACPI_SRC)/nfit.o 32 + nfit-y := $(ACPI_SRC)/core.o 33 33 nfit-y += config_check.o 34 34 35 35 nd_pmem-y := $(NVDIMM_SRC)/pmem.o
+1 -1
tools/testing/nvdimm/test/Kbuild
··· 1 1 ccflags-y := -I$(src)/../../../../drivers/nvdimm/ 2 - ccflags-y += -I$(src)/../../../../drivers/acpi/ 2 + ccflags-y += -I$(src)/../../../../drivers/acpi/nfit/ 3 3 4 4 obj-m += nfit_test.o 5 5 obj-m += nfit_test_iomap.o