Skip to content

Commit

Permalink
m68k: Provide __phys_to_pfn() and __pfn_to_phys()
Browse files Browse the repository at this point in the history
The defconfig build of m68k was failing with the error:
implicit declaration of function '__pfn_to_phys'

Other architectures have added <asm/memory.h>, but if we do so here then
we will also get redeclaration of some other functions. So it is better
to copy these macros into page.h.

Fixes: 0a3c3bf11240 ("x86, mm: introduce vmem_altmap to augment vmemmap_populate()")
Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
Cc: Dan Williams <dan.j.williams@intel.com>
Reported-by: Guenter Roeck <linux@roeck-us.net> (m68knommu)
[geert: Apply to page.h instead of page_mm.h to cover nommu, reword]
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
  • Loading branch information
Sudip Mukherjee authored and Geert Uytterhoeven committed Jan 10, 2016
1 parent 2d52261 commit eb37bc3
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions arch/m68k/include/asm/page.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ extern unsigned long _ramend;
#include <asm/page_no.h>
#endif

#define __phys_to_pfn(paddr) ((unsigned long)((paddr) >> PAGE_SHIFT))
#define __pfn_to_phys(pfn) PFN_PHYS(pfn)

#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \
VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)

Expand Down

0 comments on commit eb37bc3

Please sign in to comment.