From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030557AbWBNKjU (ORCPT ); Tue, 14 Feb 2006 05:39:20 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1030263AbWBNKjU (ORCPT ); Tue, 14 Feb 2006 05:39:20 -0500 Received: from fgwmail5.fujitsu.co.jp ([192.51.44.35]:26270 "EHLO fgwmail5.fujitsu.co.jp") by vger.kernel.org with ESMTP id S1030557AbWBNKjT (ORCPT ); Tue, 14 Feb 2006 05:39:19 -0500 Message-ID: <43F1B398.40802@jp.fujitsu.com> Date: Tue, 14 Feb 2006 19:40:24 +0900 From: KAMEZAWA Hiroyuki User-Agent: Thunderbird 1.5 (Windows/20051201) MIME-Version: 1.0 To: Linux Kernel Mailing List CC: Andrew Morton , kyle@mcmartin.ca, grundler@parisc-linux.org, matthew@wil.cx Subject: [PATCH] unify pfn_to_page take3 [13/23] parisc pfn_to_page References: <43F1A753.2020003@jp.fujitsu.com> In-Reply-To: <43F1A753.2020003@jp.fujitsu.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org PARISC can use generic funcs. Signed-Off-By: KAMEZAWA Hiroyuki Index: testtree/include/asm-parisc/mmzone.h =================================================================== --- testtree.orig/include/asm-parisc/mmzone.h +++ testtree/include/asm-parisc/mmzone.h @@ -25,23 +25,6 @@ extern struct node_map_data node_data[]; pg_data_t *__pgdat = NODE_DATA(nid); \ __pgdat->node_start_pfn + __pgdat->node_spanned_pages; \ }) -#define node_localnr(pfn, nid) ((pfn) - node_start_pfn(nid)) - -#define pfn_to_page(pfn) \ -({ \ - unsigned long __pfn = (pfn); \ - int __node = pfn_to_nid(__pfn); \ - &NODE_DATA(__node)->node_mem_map[node_localnr(__pfn,__node)]; \ -}) - -#define page_to_pfn(pg) \ -({ \ - struct page *__page = pg; \ - struct zone *__zone = page_zone(__page); \ - BUG_ON(__zone == NULL); \ - (unsigned long)(__page - __zone->zone_mem_map) \ - + __zone->zone_start_pfn; \ -}) /* We have these possible memory map layouts: * Astro: 0-3.75, 67.75-68, 4-64 Index: testtree/include/asm-parisc/page.h =================================================================== --- testtree.orig/include/asm-parisc/page.h +++ testtree/include/asm-parisc/page.h @@ -130,8 +130,6 @@ extern int npmem_ranges; #define __va(x) ((void *)((unsigned long)(x)+PAGE_OFFSET)) #ifndef CONFIG_DISCONTIGMEM -#define pfn_to_page(pfn) (mem_map + (pfn)) -#define page_to_pfn(page) ((unsigned long)((page) - mem_map)) #define pfn_valid(pfn) ((pfn) < max_mapnr) #endif /* CONFIG_DISCONTIGMEM */ @@ -152,6 +150,7 @@ extern int npmem_ranges; #endif /* __KERNEL__ */ +#include #include #endif /* _PARISC_PAGE_H */