From be6a787e8dc0dc95bc5a885c37155239d8904a28 Mon Sep 17 00:00:00 2001 From: KAMEZAWA Hiroyuki Date: Mon, 27 Mar 2006 01:15:46 -0800 Subject: [PATCH] --- yaml --- r: 24299 b: refs/heads/master c: 104b8deaa5c0144cccfc7d914413ff80c7176af1 h: refs/heads/master i: 24297: 49c539de17ad2960965a5adebf686bd9ed336eb8 24295: 0fdc6ae15c136904b5e6b9742364338c61af30c1 v: v3 --- [refs] | 2 +- trunk/include/asm-sh/page.h | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e7cc0af0b742..1b75218670f3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aed630434c4fc0bca8ed62f6730d44ba00bdf595 +refs/heads/master: 104b8deaa5c0144cccfc7d914413ff80c7176af1 diff --git a/trunk/include/asm-sh/page.h b/trunk/include/asm-sh/page.h index 972c3f655b2a..9c89287c3e56 100644 --- a/trunk/include/asm-sh/page.h +++ b/trunk/include/asm-sh/page.h @@ -105,9 +105,7 @@ typedef struct { unsigned long pgprot; } pgprot_t; /* PFN start number, because of __MEMORY_START */ #define PFN_START (__MEMORY_START >> PAGE_SHIFT) - -#define pfn_to_page(pfn) (mem_map + (pfn) - PFN_START) -#define page_to_pfn(page) ((unsigned long)((page) - mem_map) + PFN_START) +#define ARCH_PFN_OFFSET (FPN_START) #define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT) #define pfn_valid(pfn) (((pfn) - PFN_START) < max_mapnr) #define virt_addr_valid(kaddr) pfn_valid(__pa(kaddr) >> PAGE_SHIFT) @@ -117,6 +115,7 @@ typedef struct { unsigned long pgprot; } pgprot_t; #endif /* __KERNEL__ */ +#include #include #endif /* __ASM_SH_PAGE_H */