[PATCH] m68k: fix build failure

[PATCH] m68k: fix build failure

[Sudip Mukherjee]

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_mm.h.

Fixes: 0a3c3bf11240 ("x86, mm: introduce vmem_altmap to augment vmemmap_populate()")
Cc: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
---

m68k defconfig build log of next-20160104 is at:
https://travis-ci.org/sudipm-mukherjee/parport/jobs/100068521

 arch/m68k/include/asm/page_mm.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/m68k/include/asm/page_mm.h b/arch/m68k/include/asm/page_mm.h
index e7a1946..63aa14d 100644
--- a/arch/m68k/include/asm/page_mm.h
+++ b/arch/m68k/include/asm/page_mm.h
@@ -165,6 +165,9 @@ static inline __attribute_const__ int __virt_to_node_shift(void)
 	((__p) - pgdat->node_mem_map) + pgdat->node_start_pfn;		\
 })
 
+#define __phys_to_pfn(paddr)	((unsigned long)((paddr) >> PAGE_SHIFT))
+#define __pfn_to_phys(pfn)	PFN_PHYS(pfn)
+
 #define virt_addr_valid(kaddr)	((void *)(kaddr) >= (void *)PAGE_OFFSET && (void *)(kaddr) < high_memory)
 #define pfn_valid(pfn)		virt_addr_valid(pfn_to_virt(pfn))
 
-- 
1.9.1

Re: [PATCH] m68k: fix build failure

[Geert Uytterhoeven]

On Mon, Jan 4, 2016 at 11:57 AM, Sudip Mukherjee
<sudipm.mukherjee@gmail.com> wrote:
> 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_mm.h.
>
> Fixes: 0a3c3bf11240 ("x86, mm: introduce vmem_altmap to augment vmemmap_populate()")
> Cc: Dan Williams <dan.j.williams@intel.com>
> Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>

Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH] m68k: fix build failure

[Geert Uytterhoeven]

On Sun, Jan 10, 2016 at 10:35 AM, Geert Uytterhoeven
<geert@linux-m68k.org> wrote:
> On Mon, Jan 4, 2016 at 11:57 AM, Sudip Mukherjee
> <sudipm.mukherjee@gmail.com> wrote:
>> 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_mm.h.
>>
>> Fixes: 0a3c3bf11240 ("x86, mm: introduce vmem_altmap to augment vmemmap_populate()")
>> Cc: Dan Williams <dan.j.williams@intel.com>
>> Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
>
> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>

Or should I take this through the m68k tree? It's getting a bit late for
adding new v4.5 stuff...

I see it's already in mm.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH] m68k: fix build failure

[Geert Uytterhoeven]

On Sun, Jan 10, 2016 at 10:37 AM, Geert Uytterhoeven
<geert@linux-m68k.org> wrote:
> On Sun, Jan 10, 2016 at 10:35 AM, Geert Uytterhoeven
> <geert@linux-m68k.org> wrote:
>> On Mon, Jan 4, 2016 at 11:57 AM, Sudip Mukherjee
>> <sudipm.mukherjee@gmail.com> wrote:
>>> 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_mm.h.
>>>
>>> Fixes: 0a3c3bf11240 ("x86, mm: introduce vmem_altmap to augment vmemmap_populate()")
>>> Cc: Dan Williams <dan.j.williams@intel.com>
>>> Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
>>
>> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
>
> Or should I take this through the m68k tree? It's getting a bit late for
> adding new v4.5 stuff...
>
> I see it's already in mm.

I would like to withdraw my Acked-by.

I'm gonna apply it to page.h instead of page_mm.h, to cover the nommu
case, and will queue for v4.5.

Thanks!

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds