diff options
author | Dan Williams <dan.j.williams@intel.com> | 2016-06-03 18:06:47 -0700 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2016-07-12 19:25:38 -0700 |
commit | 7a9eb20666317794d0279843fbd091af93907780 (patch) | |
tree | 022accc57a56ee2988f29fe718546b0f1ec5dca0 /drivers/acpi | |
parent | 7c8a6a71904d57ae5fb24140f9661ec22ca9ee85 (diff) | |
download | linux-7a9eb20666317794d0279843fbd091af93907780.tar.bz2 |
pmem: kill __pmem address space
The __pmem address space was meant to annotate codepaths that touch
persistent memory and need to coordinate a call to wmb_pmem(). Now that
wmb_pmem() is gone, there is little need to keep this annotation.
Cc: Christoph Hellwig <hch@lst.de>
Cc: Ross Zwisler <ross.zwisler@linux.intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r-- | drivers/acpi/nfit.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/nfit.h b/drivers/acpi/nfit.h index 9fda77cf81da..80fb2c0ac8bf 100644 --- a/drivers/acpi/nfit.h +++ b/drivers/acpi/nfit.h @@ -164,7 +164,7 @@ enum nd_blk_mmio_selector { struct nd_blk_addr { union { void __iomem *base; - void __pmem *aperture; + void *aperture; }; }; |