diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-05 16:23:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-05 16:23:24 -0700 |
| commit | 47c297529bd23d93d2a088d9620bb220763e9cb1 (patch) | |
| tree | 52672d42102a4d0c8b4fc13b79812290efbd5d3a /include | |
| parent | fd4e5f29f7354c3e3edaa03d37a7bf83b0cbae36 (diff) | |
| parent | 7cc1712b8a778c8077048969848857895d242009 (diff) | |
| download | kernel_samsung_aries-47c297529bd23d93d2a088d9620bb220763e9cb1.zip kernel_samsung_aries-47c297529bd23d93d2a088d9620bb220763e9cb1.tar.gz kernel_samsung_aries-47c297529bd23d93d2a088d9620bb220763e9cb1.tar.bz2 | |
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-sparc64/pgalloc.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/include/asm-sparc64/pgalloc.h b/include/asm-sparc64/pgalloc.h index 2c28e1f..b9b1914 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) #define pmd_populate(MM,PMD,PTE_PAGE) \ pmd_populate_kernel(MM,PMD,page_address(PTE_PAGE)) -extern pte_t *__pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address); - -static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address) -{ - return __pte_alloc_one_kernel(mm, address); -} +extern pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address); static inline struct page * pte_alloc_one(struct mm_struct *mm, unsigned long addr) { - pte_t *pte = __pte_alloc_one_kernel(mm, addr); + pte_t *pte = pte_alloc_one_kernel(mm, addr); if (pte) return virt_to_page(pte); |