Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0d33403 authored by Anton Blanchard's avatar Anton Blanchard Committed by Paul Mackerras
Browse files

[PATCH] ppc64: prep for NUMA sparsemem rework 



Remove an unused numa define and move a discontigmem specific define
inside the relevant ifdef.

I will submit a separate patch to remove them from other architectures,
but the ppc64 patches to follow depend on this.

Signed-off-by: default avatarAnton Blanchard <anton@samba.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 1dff227e

include/asm-ppc64/mmzone.h

+1 −6
Original line number Diff line number Diff line
@@ -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)