diff options
-rw-r--r-- | include/asm-generic/memory_model.h | 7 | ||||
-rw-r--r-- | mm/page_alloc.c | 13 |
2 files changed, 0 insertions, 20 deletions
diff --git a/include/asm-generic/memory_model.h b/include/asm-generic/memory_model.h index 36fa286adad5..4c8d0afae711 100644 --- a/include/asm-generic/memory_model.h +++ b/include/asm-generic/memory_model.h | |||
@@ -69,15 +69,8 @@ | |||
69 | }) | 69 | }) |
70 | #endif /* CONFIG_FLATMEM/DISCONTIGMEM/SPARSEMEM */ | 70 | #endif /* CONFIG_FLATMEM/DISCONTIGMEM/SPARSEMEM */ |
71 | 71 | ||
72 | #ifdef CONFIG_OUT_OF_LINE_PFN_TO_PAGE | ||
73 | struct page; | ||
74 | /* this is useful when inlined pfn_to_page is too big */ | ||
75 | extern struct page *pfn_to_page(unsigned long pfn); | ||
76 | extern unsigned long page_to_pfn(struct page *page); | ||
77 | #else | ||
78 | #define page_to_pfn __page_to_pfn | 72 | #define page_to_pfn __page_to_pfn |
79 | #define pfn_to_page __pfn_to_page | 73 | #define pfn_to_page __pfn_to_page |
80 | #endif /* CONFIG_OUT_OF_LINE_PFN_TO_PAGE */ | ||
81 | 74 | ||
82 | #endif /* __ASSEMBLY__ */ | 75 | #endif /* __ASSEMBLY__ */ |
83 | 76 | ||
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index d531e8ef9984..7bf22e045318 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
@@ -4587,19 +4587,6 @@ void *__init alloc_large_system_hash(const char *tablename, | |||
4587 | return table; | 4587 | return table; |
4588 | } | 4588 | } |
4589 | 4589 | ||
4590 | #ifdef CONFIG_OUT_OF_LINE_PFN_TO_PAGE | ||
4591 | struct page *pfn_to_page(unsigned long pfn) | ||
4592 | { | ||
4593 | return __pfn_to_page(pfn); | ||
4594 | } | ||
4595 | unsigned long page_to_pfn(struct page *page) | ||
4596 | { | ||
4597 | return __page_to_pfn(page); | ||
4598 | } | ||
4599 | EXPORT_SYMBOL(pfn_to_page); | ||
4600 | EXPORT_SYMBOL(page_to_pfn); | ||
4601 | #endif /* CONFIG_OUT_OF_LINE_PFN_TO_PAGE */ | ||
4602 | |||
4603 | /* Return a pointer to the bitmap storing bits affecting a block of pages */ | 4590 | /* Return a pointer to the bitmap storing bits affecting a block of pages */ |
4604 | static inline unsigned long *get_pageblock_bitmap(struct zone *zone, | 4591 | static inline unsigned long *get_pageblock_bitmap(struct zone *zone, |
4605 | unsigned long pfn) | 4592 | unsigned long pfn) |