Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22e58f9d authored by Andrew Morton's avatar Andrew Morton Committed by Geert Uytterhoeven
Browse files

m68k: __pa(): cast arg to long 



Fixes this:

drivers/char/mem.c: In function 'mmap_kmem':
drivers/char/mem.c:342: warning: cast to pointer from integer of different size

by doing what other archtiectures do.

Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent 8ce71db2

arch/m68k/include/asm/page_mm.h

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ static inline unsigned long ___pa(void *vaddr) 
		: "0" (vaddr), "i" (m68k_fixup_memoffset));

	return paddr;

}

#define __pa(vaddr)	___pa((void *)(vaddr))

#define __pa(vaddr)	___pa((void *)(long)(vaddr))

static inline void *__va(unsigned long paddr)

{

	void *vaddr;