FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-01-27 13:43:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

libnvdimm, pmem: fix ia64 build, use PHYS_PFN

Browse Source 
drivers/nvdimm/pmem.c: In function 'nvdimm_namespace_attach_pfn':
   drivers/nvdimm/pmem.c:367:3: error: implicit declaration of function
   	'__phys_to_pfn' [-Werror=implicit-function-declaration]
   .base_pfn = __phys_to_pfn(nsio->res.start),

ia64 does not provide __phys_to_pfn(), just use the PHYS_PFN() alias.

Cc: Guenter Roeck <linux@roeck-us.net>
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
This commit is contained in:
Dan Williams 2016-03-06 08:04:12 -08:00
parent f6ed58c70d
commit 45f68802f2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/nvdimm/pmem.c
View File

@ -407,15 +407,15 @@ static int nvdimm_namespace_detach_pfn(struct nd_namespace_common *ndns)
*/ */
static unsigned long init_altmap_base(resource_size_t base) static unsigned long init_altmap_base(resource_size_t base)
{ {
unsigned long base_pfn = __phys_to_pfn(base); unsigned long base_pfn = PHYS_PFN(base);
return PFN_SECTION_ALIGN_DOWN(base_pfn); return PFN_SECTION_ALIGN_DOWN(base_pfn);
} }
static unsigned long init_altmap_reserve(resource_size_t base) static unsigned long init_altmap_reserve(resource_size_t base)
{ {
unsigned long reserve = __phys_to_pfn(SZ_8K); unsigned long reserve = PHYS_PFN(SZ_8K);
unsigned long base_pfn = __phys_to_pfn(base); unsigned long base_pfn = PHYS_PFN(base);
reserve += base_pfn - PFN_SECTION_ALIGN_DOWN(base_pfn); reserve += base_pfn - PFN_SECTION_ALIGN_DOWN(base_pfn);
return reserve; return reserve;
@ -458,7 +458,7 @@ static int __nvdimm_namespace_attach_pfn(struct nd_pfn *nd_pfn)
le64_to_cpu(nd_pfn->pfn_sb->npfns), le64_to_cpu(nd_pfn->pfn_sb->npfns),
nd_pfn->npfns); nd_pfn->npfns);
altmap = & __altmap; altmap = & __altmap;
altmap->free = __phys_to_pfn(pmem->data_offset - SZ_8K); altmap->free = PHYS_PFN(pmem->data_offset - SZ_8K);
altmap->alloc = 0; altmap->alloc = 0;
} else { } else {
rc = -ENXIO; rc = -ENXIO;