diff options
author | Christoph Hellwig <hch@lst.de> | 2005-05-05 17:27:56 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2005-05-05 17:27:56 -0400 |
commit | 8edf72ebce06d52e855438ec18fe20dea7a4cc04 (patch) | |
tree | a75409d5ae04a31209d52b11983158d8d4d4a199 | |
parent | bfd4bda097f8758d28e632ff2035e25577f6b060 (diff) |
[SPARC64]: Kill useless __pte_alloc_one_kernel indirection
warning: untested, but it there's not too much chance for screwups
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | arch/sparc64/kernel/sparc64_ksyms.c | 2 | ||||
-rw-r--r-- | arch/sparc64/mm/init.c | 2 | ||||
-rw-r--r-- | include/asm-sparc64/pgalloc.h | 9 |
3 files changed, 4 insertions, 9 deletions
diff --git a/arch/sparc64/kernel/sparc64_ksyms.c b/arch/sparc64/kernel/sparc64_ksyms.c index cad5a1122800..e78cc53594fa 100644 --- a/arch/sparc64/kernel/sparc64_ksyms.c +++ b/arch/sparc64/kernel/sparc64_ksyms.c | |||
@@ -278,7 +278,7 @@ EXPORT_SYMBOL(verify_compat_iovec); | |||
278 | 278 | ||
279 | EXPORT_SYMBOL(dump_thread); | 279 | EXPORT_SYMBOL(dump_thread); |
280 | EXPORT_SYMBOL(dump_fpu); | 280 | EXPORT_SYMBOL(dump_fpu); |
281 | EXPORT_SYMBOL(__pte_alloc_one_kernel); | 281 | EXPORT_SYMBOL(pte_alloc_one_kernel); |
282 | #ifndef CONFIG_SMP | 282 | #ifndef CONFIG_SMP |
283 | EXPORT_SYMBOL(pgt_quicklists); | 283 | EXPORT_SYMBOL(pgt_quicklists); |
284 | #endif | 284 | #endif |
diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c index db6fa77b4dab..9c5222075da9 100644 --- a/arch/sparc64/mm/init.c +++ b/arch/sparc64/mm/init.c | |||
@@ -1114,7 +1114,7 @@ struct pgtable_cache_struct pgt_quicklists; | |||
1114 | #else | 1114 | #else |
1115 | #define DC_ALIAS_SHIFT 0 | 1115 | #define DC_ALIAS_SHIFT 0 |
1116 | #endif | 1116 | #endif |
1117 | pte_t *__pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address) | 1117 | pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address) |
1118 | { | 1118 | { |
1119 | struct page *page; | 1119 | struct page *page; |
1120 | unsigned long color; | 1120 | unsigned long color; |
diff --git a/include/asm-sparc64/pgalloc.h b/include/asm-sparc64/pgalloc.h index 2c28e1f605b7..b9b1914aae63 100644 --- a/include/asm-sparc64/pgalloc.h +++ b/include/asm-sparc64/pgalloc.h | |||
@@ -122,17 +122,12 @@ static __inline__ void free_pmd_slow(pmd_t *pmd) | |||
122 | #define pmd_populate(MM,PMD,PTE_PAGE) \ | 122 | #define pmd_populate(MM,PMD,PTE_PAGE) \ |
123 | pmd_populate_kernel(MM,PMD,page_address(PTE_PAGE)) | 123 | pmd_populate_kernel(MM,PMD,page_address(PTE_PAGE)) |
124 | 124 | ||
125 | extern pte_t *__pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address); | 125 | extern pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address); |
126 | |||
127 | static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address) | ||
128 | { | ||
129 | return __pte_alloc_one_kernel(mm, address); | ||
130 | } | ||
131 | 126 | ||
132 | static inline struct page * | 127 | static inline struct page * |
133 | pte_alloc_one(struct mm_struct *mm, unsigned long addr) | 128 | pte_alloc_one(struct mm_struct *mm, unsigned long addr) |
134 | { | 129 | { |
135 | pte_t *pte = __pte_alloc_one_kernel(mm, addr); | 130 | pte_t *pte = pte_alloc_one_kernel(mm, addr); |
136 | 131 | ||
137 | if (pte) | 132 | if (pte) |
138 | return virt_to_page(pte); | 133 | return virt_to_page(pte); |