Commit 2774812f authored by Dave Hansen's avatar Dave Hansen Committed by Linus Torvalds
Browse files

[PATCH] memory hotplug prep: kill local_mapnr 



The following series implements memory hot-add for ppc64 and i386.  There are
x86_64 and ia64 implementations that will be submitted shortly as well,
through the normal maintainers.

This patch:

local_mapnr is unused, except for in an alpha header.  Keep the alpha one,
kill the rest.

Signed-off-by: default avatarDave Hansen <haveblue@us.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 1a44e149

include/asm-i386/mmzone.h

+0 −6
Original line number Diff line number Diff line
@@ -88,12 +88,6 @@ static inline int pfn_to_nid(unsigned long pfn) 
	__pgdat->node_start_pfn + __pgdat->node_spanned_pages;		\

})



#define local_mapnr(kvaddr)						\

({									\

	unsigned long __pfn = __pa(kvaddr) >> PAGE_SHIFT;		\

	(__pfn - node_start_pfn(pfn_to_nid(__pfn)));			\

})



/* XXX: FIXME -- wli */

#define kern_addr_valid(kaddr)	(0)

include/asm-m32r/mmzone.h

+0 −6
Original line number Diff line number Diff line
@@ -21,12 +21,6 @@ extern struct pglist_data *node_data[]; 
	__pgdat->node_start_pfn + __pgdat->node_spanned_pages - 1;	\

})



#define local_mapnr(kvaddr)						\

({									\

	unsigned long __pfn = __pa(kvaddr) >> PAGE_SHIFT;		\

	(__pfn - node_start_pfn(pfn_to_nid(__pfn)));			\

})



#define pfn_to_page(pfn)						\

({									\

	unsigned long __pfn = pfn;					\

include/asm-parisc/mmzone.h

+0 −6
Original line number Diff line number Diff line
@@ -27,12 +27,6 @@ extern struct node_map_data node_data[]; 
})

#define node_localnr(pfn, nid)		((pfn) - node_start_pfn(nid))



#define local_mapnr(kvaddr)						\

({									\

	unsigned long __pfn = __pa(kvaddr) >> PAGE_SHIFT;		\

	(__pfn - node_start_pfn(pfn_to_nid(__pfn)));			\

})



#define pfn_to_page(pfn)						\

({									\

	unsigned long __pfn = (pfn);					\

include/asm-ppc64/mmzone.h

+0 −3
Original line number Diff line number Diff line
@@ -67,9 +67,6 @@ static inline int pa_to_nid(unsigned long pa) 
#define node_start_pfn(nid)	(NODE_DATA(nid)->node_start_pfn)

#define node_end_pfn(nid)	(NODE_DATA(nid)->node_end_pfn)



#define local_mapnr(kvaddr) \

	( (__pa(kvaddr) >> PAGE_SHIFT) - node_start_pfn(kvaddr_to_nid(kvaddr)) 



#ifdef CONFIG_DISCONTIGMEM



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE