diff options
| author | David Vrabel <david.vrabel@csr.com> | 2009-01-07 05:45:25 -0500 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2009-01-07 05:45:25 -0500 |
| commit | a23e66f3b8cfdedec14541e71ef29a754870a20c (patch) | |
| tree | f8ac23572982e92e6f8ae09c4039db627bdf53ee /include/asm-generic/memory_model.h | |
| parent | 04c470adb01c62bb9bd663cfc4875cf0a4eb01ab (diff) | |
| parent | ede6f5aea054d3fb67c78857f7abdee602302043 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Diffstat (limited to 'include/asm-generic/memory_model.h')
| -rw-r--r-- | include/asm-generic/memory_model.h | 7 |
1 files changed, 0 insertions, 7 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 | ||