diff options
| author | KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> | 2006-03-27 01:15:45 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-27 08:44:46 -0800 |
| commit | aed630434c4fc0bca8ed62f6730d44ba00bdf595 (patch) | |
| tree | cf90afd6871a3245517cceda3e69671929248348 /include | |
| parent | f68d4c996d3062c8fe64e3ed36d4c83d23288ad8 (diff) | |
| download | kernel_samsung_smdk4412-aed630434c4fc0bca8ed62f6730d44ba00bdf595.zip kernel_samsung_smdk4412-aed630434c4fc0bca8ed62f6730d44ba00bdf595.tar.gz kernel_samsung_smdk4412-aed630434c4fc0bca8ed62f6730d44ba00bdf595.tar.bz2 | |
[PATCH] unify pfn_to_page: s390 pfn_to_page
s390 can use generic funcs.
Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-s390/page.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/asm-s390/page.h b/include/asm-s390/page.h index 2430c56..3b1138a 100644 --- a/include/asm-s390/page.h +++ b/include/asm-s390/page.h @@ -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 */ |