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

Commit aed63043 authored by KAMEZAWA Hiroyuki's avatar KAMEZAWA Hiroyuki Committed by Linus Torvalds
Browse files

[PATCH] unify pfn_to_page: s390 pfn_to_page 



s390 can use generic funcs.

Signed-off-by: default avatarKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f68d4c99

include/asm-s390/page.h

+1 −2
Original line number Diff line number Diff line
@@ -181,8 +181,6 @@ page_get_storage_key(unsigned long addr) 
#define PAGE_OFFSET             0x0UL

#define __pa(x)                 (unsigned long)(x)

#define __va(x)                 (void *)(unsigned long)(x)

#define pfn_to_page(pfn)	(mem_map + (pfn))

#define page_to_pfn(page)	((unsigned long)((page) - mem_map))

#define virt_to_page(kaddr)	pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)



#define pfn_valid(pfn)		((pfn) < max_mapnr)
@@ -193,6 +191,7 @@ page_get_storage_key(unsigned long addr) 


#endif /* __KERNEL__ */



#include <asm-generic/memory_model.h>

#include <asm-generic/page.h>



#endif /* _S390_PAGE_H */