From c801cb8f0d54e5f683373cd76454b43a926f9213 Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Mon, 15 Oct 2007 11:01:33 +0900 Subject: [PATCH] --- yaml --- r: 73066 b: refs/heads/master c: afca03574555c9af9a86d5a025f0187d0b77ac32 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/asm-sh/page.h | 1 - trunk/include/asm-sh/pgtable.h | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6301fdccee1c..609126c2ff3d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ad07b1001ec5132c93a5a85679355255d1f9444d +refs/heads/master: afca03574555c9af9a86d5a025f0187d0b77ac32 diff --git a/trunk/include/asm-sh/page.h b/trunk/include/asm-sh/page.h index cb3d46c59eab..3aa8b07da47d 100644 --- a/trunk/include/asm-sh/page.h +++ b/trunk/include/asm-sh/page.h @@ -128,7 +128,6 @@ typedef struct { unsigned long pgd; } pgd_t; #define __va(x) ((void *)((unsigned long)(x)+PAGE_OFFSET)) #define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT) -#define phys_to_page(phys) (pfn_to_page(phys >> PAGE_SHIFT)) #define page_to_phys(page) (page_to_pfn(page) << PAGE_SHIFT) /* PFN start number, because of __MEMORY_START */ diff --git a/trunk/include/asm-sh/pgtable.h b/trunk/include/asm-sh/pgtable.h index cf0dd2b648c2..0b1d7c665659 100644 --- a/trunk/include/asm-sh/pgtable.h +++ b/trunk/include/asm-sh/pgtable.h @@ -399,7 +399,7 @@ static inline void set_pte(pte_t *ptep, pte_t pte) #define pmd_bad(x) (pmd_val(x) & ~PAGE_MASK) #define pages_to_mb(x) ((x) >> (20-PAGE_SHIFT)) -#define pte_page(x) phys_to_page(pte_val(x)&PTE_PHYS_MASK) +#define pte_page(x) pfn_to_page(pte_pfn(x)) /* * The following only work if pte_present() is true.