diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-11 23:23:25 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-11 23:23:25 -0500 |
| commit | fe3f2053fd42148b3ebb7b90de5f20eaf3393860 (patch) | |
| tree | 8915aff27ef95943659565eff008f4a81e00577a /include | |
| parent | 7fc7e2eeecb599ba719c4c4503100fc8cd6a6920 (diff) | |
| parent | ef969434005e772218c0b8086539804605070fa8 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-powerpc/mmu.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-powerpc/mmu.h b/include/asm-powerpc/mmu.h index c1b4bbabbe97..29b0bb0086d3 100644 --- a/include/asm-powerpc/mmu.h +++ b/include/asm-powerpc/mmu.h | |||
| @@ -220,7 +220,8 @@ extern int __hash_page_64K(unsigned long ea, unsigned long access, | |||
| 220 | unsigned int local); | 220 | unsigned int local); |
| 221 | struct mm_struct; | 221 | struct mm_struct; |
| 222 | extern int hash_huge_page(struct mm_struct *mm, unsigned long access, | 222 | extern int hash_huge_page(struct mm_struct *mm, unsigned long access, |
| 223 | unsigned long ea, unsigned long vsid, int local); | 223 | unsigned long ea, unsigned long vsid, int local, |
| 224 | unsigned long trap); | ||
| 224 | 225 | ||
| 225 | extern void htab_finish_init(void); | 226 | extern void htab_finish_init(void); |
| 226 | extern int htab_bolt_mapping(unsigned long vstart, unsigned long vend, | 227 | extern int htab_bolt_mapping(unsigned long vstart, unsigned long vend, |