From 59c67f3e5caa6d573f9ffcf4fa71b68e3b443baf Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Thu, 14 Jan 2010 03:14:53 -0800 Subject: [PATCH] --- yaml --- r: 179831 b: refs/heads/master c: 8654164f54bd02787ae91db8526dcae8e7e34eeb h: refs/heads/master i: 179829: 4506a500174aa685199176b2d768ec6fa2285886 179827: 38a046feb614fd12fa11911d00d8dee316b9cb22 179823: 1cc2346dbc517d1298bad1061b152232b173b294 v: v3 --- [refs] | 2 +- trunk/arch/sparc/include/asm/io_32.h | 2 +- trunk/arch/sparc/include/asm/page_32.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 20cdbe4f3be4..df5a5e8b5cff 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: af2e7cc27016eadcf3840325aaef59afece3b8f2 +refs/heads/master: 8654164f54bd02787ae91db8526dcae8e7e34eeb diff --git a/trunk/arch/sparc/include/asm/io_32.h b/trunk/arch/sparc/include/asm/io_32.h index 93fe21e02c86..679c7504625a 100644 --- a/trunk/arch/sparc/include/asm/io_32.h +++ b/trunk/arch/sparc/include/asm/io_32.h @@ -8,7 +8,7 @@ #include /* IO address mapping routines need this */ #include -#define page_to_phys(page) (((page) - mem_map) << PAGE_SHIFT) +#define page_to_phys(page) (page_to_pfn(page) << PAGE_SHIFT) static inline u32 flip_dword (u32 l) { diff --git a/trunk/arch/sparc/include/asm/page_32.h b/trunk/arch/sparc/include/asm/page_32.h index f72080bdda94..156707b0f18d 100644 --- a/trunk/arch/sparc/include/asm/page_32.h +++ b/trunk/arch/sparc/include/asm/page_32.h @@ -143,7 +143,7 @@ extern unsigned long pfn_base; #define phys_to_virt __va #define ARCH_PFN_OFFSET (pfn_base) -#define virt_to_page(kaddr) (mem_map + ((((unsigned long)(kaddr)-PAGE_OFFSET)>>PAGE_SHIFT))) +#define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT) #define pfn_valid(pfn) (((pfn) >= (pfn_base)) && (((pfn)-(pfn_base)) < max_mapnr)) #define virt_addr_valid(kaddr) ((((unsigned long)(kaddr)-PAGE_OFFSET)>>PAGE_SHIFT) < max_mapnr)