From b144f5924c5208e72e5710e5d722e8749f4874b1 Mon Sep 17 00:00:00 2001 From: Anton Blanchard Date: Fri, 11 Nov 2005 14:12:26 +1100 Subject: [PATCH] --- yaml --- r: 13859 b: refs/heads/master c: c0d33403ad39f4e945dd5b3febe5c1f94a9a1d29 h: refs/heads/master i: 13857: aef37f31f79a953912292589970975d36f7b978f 13855: 08ac41bf17869f4a149f13343f832b4ca6955a06 v: v3 --- [refs] | 2 +- trunk/include/asm-ppc64/mmzone.h | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index c07b37488a5b..e7fb1bf684fa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1dff227e0184de3d1f12265dff0c47d86dad2eec +refs/heads/master: c0d33403ad39f4e945dd5b3febe5c1f94a9a1d29 diff --git a/trunk/include/asm-ppc64/mmzone.h b/trunk/include/asm-ppc64/mmzone.h index 15e777ce0f4a..f6e95da96427 100644 --- a/trunk/include/asm-ppc64/mmzone.h +++ b/trunk/include/asm-ppc64/mmzone.h @@ -66,8 +66,6 @@ static inline int pa_to_nid(unsigned long pa) return nid; } -#define node_localnr(pfn, nid) ((pfn) - NODE_DATA(nid)->node_start_pfn) - /* * Following are macros that each numa implmentation must define. */ @@ -77,10 +75,7 @@ static inline int pa_to_nid(unsigned long pa) #ifdef CONFIG_DISCONTIGMEM -/* - * Given a kernel address, find the home node of the underlying memory. - */ -#define kvaddr_to_nid(kaddr) pa_to_nid(__pa(kaddr)) +#define node_localnr(pfn, nid) ((pfn) - NODE_DATA(nid)->node_start_pfn) #define pfn_to_nid(pfn) pa_to_nid((unsigned long)(pfn) << PAGE_SHIFT)