diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-13 20:35:48 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-13 20:35:48 -0500 |
| commit | 2870f6c4d136e093e22159b8916918ff42c92218 (patch) | |
| tree | f822a4fa9f72a901a40eda4a12dc0055ff8f6266 /tools | |
| parent | 934f98d7e8123892bd9ca8ea08728ee0784e6597 (diff) | |
| parent | 152d7bd80dca5ce77ec2d7313149a2ab990e808e (diff) | |
Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm
Pull libnvdimm fixes from Dan Williams:
- three fixes tagged for -stable including a crash fix, simple
performance tweak, and an invalid i/o error.
- build regression fix for the nvdimm unit tests
- nvdimm documentation update
* 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
dax: fix __dax_pmd_fault crash
libnvdimm: documentation clarifications
libnvdimm, pmem: fix size trim in pmem_direct_access()
libnvdimm, e820: fix numa node for e820-type-12 pmem ranges
tools/testing/nvdimm, acpica: fix flag rename build breakage
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/testing/nvdimm/test/nfit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/nvdimm/test/nfit.c b/tools/testing/nvdimm/test/nfit.c index dce346aa94ea..40ab4476c80a 100644 --- a/tools/testing/nvdimm/test/nfit.c +++ b/tools/testing/nvdimm/test/nfit.c | |||
| @@ -1135,7 +1135,7 @@ static void nfit_test1_setup(struct nfit_test *t) | |||
| 1135 | memdev->interleave_ways = 1; | 1135 | memdev->interleave_ways = 1; |
| 1136 | memdev->flags = ACPI_NFIT_MEM_SAVE_FAILED | ACPI_NFIT_MEM_RESTORE_FAILED | 1136 | memdev->flags = ACPI_NFIT_MEM_SAVE_FAILED | ACPI_NFIT_MEM_RESTORE_FAILED |
| 1137 | | ACPI_NFIT_MEM_FLUSH_FAILED | ACPI_NFIT_MEM_HEALTH_OBSERVED | 1137 | | ACPI_NFIT_MEM_FLUSH_FAILED | ACPI_NFIT_MEM_HEALTH_OBSERVED |
| 1138 | | ACPI_NFIT_MEM_ARMED; | 1138 | | ACPI_NFIT_MEM_NOT_ARMED; |
| 1139 | 1139 | ||
| 1140 | offset += sizeof(*memdev); | 1140 | offset += sizeof(*memdev); |
| 1141 | /* dcr-descriptor0 */ | 1141 | /* dcr-descriptor0 */ |