From f992c6307f114f7e899dffc1e9760225bb9e80f8 Mon Sep 17 00:00:00 2001 From: David Rientjes Date: Thu, 7 Dec 2006 02:14:07 +0100 Subject: [PATCH] --- yaml --- r: 43067 b: refs/heads/master c: 3529833f1ca8790df06ce218b5d9d438776696ed h: refs/heads/master i: 43065: 61546fb9981ae38709ab29683d0f6da709df03d8 43063: e26f6e37ab3e4e635f1779df5f4760a7225eb17d v: v3 --- [refs] | 2 +- trunk/arch/i386/mm/discontig.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index dddf21e18412..da4b84815193 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b6bcc4bb1cdfbc3c8612aad63a8703ac3d59f61a +refs/heads/master: 3529833f1ca8790df06ce218b5d9d438776696ed diff --git a/trunk/arch/i386/mm/discontig.c b/trunk/arch/i386/mm/discontig.c index ddbdb0336f28..103b76e56a94 100644 --- a/trunk/arch/i386/mm/discontig.c +++ b/trunk/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)); } }