提交 2774812f 编写于 作者: D Dave Hansen 提交者: Linus Torvalds

[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: NDave Hansen <haveblue@us.ibm.com>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
上级 1a44e149
...@@ -88,12 +88,6 @@ static inline int pfn_to_nid(unsigned long pfn) ...@@ -88,12 +88,6 @@ static inline int pfn_to_nid(unsigned long pfn)
__pgdat->node_start_pfn + __pgdat->node_spanned_pages; \ __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 */ /* XXX: FIXME -- wli */
#define kern_addr_valid(kaddr) (0) #define kern_addr_valid(kaddr) (0)
......
...@@ -21,12 +21,6 @@ extern struct pglist_data *node_data[]; ...@@ -21,12 +21,6 @@ extern struct pglist_data *node_data[];
__pgdat->node_start_pfn + __pgdat->node_spanned_pages - 1; \ __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) \ #define pfn_to_page(pfn) \
({ \ ({ \
unsigned long __pfn = pfn; \ unsigned long __pfn = pfn; \
......
...@@ -27,12 +27,6 @@ extern struct node_map_data node_data[]; ...@@ -27,12 +27,6 @@ extern struct node_map_data node_data[];
}) })
#define node_localnr(pfn, nid) ((pfn) - node_start_pfn(nid)) #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) \ #define pfn_to_page(pfn) \
({ \ ({ \
unsigned long __pfn = (pfn); \ unsigned long __pfn = (pfn); \
......
...@@ -67,9 +67,6 @@ static inline int pa_to_nid(unsigned long pa) ...@@ -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_start_pfn(nid) (NODE_DATA(nid)->node_start_pfn)
#define node_end_pfn(nid) (NODE_DATA(nid)->node_end_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 #ifdef CONFIG_DISCONTIGMEM
/* /*
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册