Skip to content

Commit

Permalink
[PATCH] memory hotplug prep: kill local_mapnr
Browse files Browse the repository at this point in the history
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: Dave Hansen <haveblue@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Dave Hansen authored and Linus Torvalds committed Oct 30, 2005
1 parent 1a44e14 commit 2774812
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 21 deletions.
6 changes: 0 additions & 6 deletions include/asm-i386/mmzone.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
6 changes: 0 additions & 6 deletions include/asm-m32r/mmzone.h
Original file line number Diff line number Diff line change
Expand Up @@ -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; \
Expand Down
6 changes: 0 additions & 6 deletions include/asm-parisc/mmzone.h
Original file line number Diff line number Diff line change
Expand Up @@ -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); \
Expand Down
3 changes: 0 additions & 3 deletions include/asm-ppc64/mmzone.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

/*
Expand Down

0 comments on commit 2774812

Please sign in to comment.