From: David Rientjes Date: Thu, 7 Dec 2006 01:14:07 +0000 (+0100) Subject: [PATCH] i386: substitute __va lookup with pfn_to_kaddr X-Git-Tag: v2.6.20-rc1~145^2^2~8^2~79 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=3529833f1ca8790df06ce218b5d9d438776696ed;p=linux-2.6-omap-h63xx.git [PATCH] i386: substitute __va lookup with pfn_to_kaddr Substitutes allocate_pgdat virtual address lookup with pfn_to_kaddr macro. Signed-off-by: David Rientjes Signed-off-by: Andi Kleen Cc: Andi Kleen Signed-off-by: Andrew Morton --- diff --git a/arch/i386/mm/discontig.c b/arch/i386/mm/discontig.c index ddbdb0336f2..103b76e56a9 100644 --- a/arch/i386/mm/discontig.c +++ b/arch/i386/mm/discontig.c @@ -168,7 +168,7 @@ static void __init allocate_pgdat(int nid) if (nid && node_has_online_mem(nid)) NODE_DATA(nid) = (pg_data_t *)node_remap_start_vaddr[nid]; else { - NODE_DATA(nid) = (pg_data_t *)(__va(min_low_pfn << PAGE_SHIFT)); + NODE_DATA(nid) = (pg_data_t *)(pfn_to_kaddr(min_low_pfn)); min_low_pfn += PFN_UP(sizeof(pg_data_t)); } }