diff options
| author | Ross Zwisler <ross.zwisler@linux.intel.com> | 2015-08-18 21:55:37 +0200 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2015-08-20 20:07:23 +0200 |
| commit | 18279b467a9d89afe44afbc19d768e834dbf4545 (patch) | |
| tree | 690e51ec2009e346ad5c8b78416390e293d743c1 /arch/x86 | |
| parent | pmem, x86: move x86 PMEM API to new pmem.h header (diff) | |
| download | linux-18279b467a9d89afe44afbc19d768e834dbf4545.tar.xz linux-18279b467a9d89afe44afbc19d768e834dbf4545.zip | |
pmem: remove layer when calling arch_has_wmb_pmem()
Prior to this change arch_has_wmb_pmem() was only called by
arch_has_pmem_api(). Both arch_has_wmb_pmem() and arch_has_pmem_api()
checked to make sure that CONFIG_ARCH_HAS_PMEM_API was enabled.
Instead, remove the old arch_has_wmb_pmem() wrapper to be rid of one
extra layer of indirection and the redundant CONFIG_ARCH_HAS_PMEM_API
check. Rename __arch_has_wmb_pmem() to arch_has_wmb_pmem() since we no
longer have a wrapper, and just have arch_has_pmem_api() call the
architecture specific arch_has_wmb_pmem() directly.
Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/include/asm/pmem.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/pmem.h b/arch/x86/include/asm/pmem.h index f43462cc91aa..1e8dbb72d6ee 100644 --- a/arch/x86/include/asm/pmem.h +++ b/arch/x86/include/asm/pmem.h @@ -67,7 +67,7 @@ static inline void arch_wmb_pmem(void) pcommit_sfence(); } -static inline bool __arch_has_wmb_pmem(void) +static inline bool arch_has_wmb_pmem(void) { #ifdef CONFIG_X86_64 /* |