Ross Zwisler 4a370df553 pmem, x86: clean up conditional pmem includes ... Prior to this change x86_64 used the pmem defines in arch/x86/include/asm/pmem.h, and UM used the default ones at the top of include/linux/pmem.h. The inclusion or exclusion in linux/pmem.h was controlled by CONFIG_ARCH_HAS_PMEM_API, but the ones in asm/pmem.h were controlled by ARCH_HAS_NOCACHE_UACCESS. Instead, control them both with CONFIG_ARCH_HAS_PMEM_API so that it's clear that they are related and we don't run into the possibility where they are both included or excluded. Also remove a bunch of stale function prototypes meant for UM in asm/pmem.h - these just conflicted with the inline defaults in linux/pmem.h and gave compile errors. 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>		2015-08-20 14:07:23 -04:00
..
asm	pmem, x86: clean up conditional pmem includes	2015-08-20 14:07:23 -04:00
uapi/asm	KVM: x86: rename quirk constants to KVM_X86_QUIRK_*	2015-07-23 08:24:42 +02:00