diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-12-20 23:03:50 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-12-20 23:03:50 -0500 |
| commit | 041387d98460b3947587929ef3a4773b8c48538f (patch) | |
| tree | 3330eebba3fa1aa7c13479e527f07b03d7fb53ed /include/asm-powerpc/mmu.h | |
| parent | 56f0356321a876a1a356712f2486d6188a3b4992 (diff) | |
| parent | b05948d9b7167e23af88cc65b9ffa4687eaf1f0d (diff) | |
Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)
Diffstat (limited to 'include/asm-powerpc/mmu.h')
| -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, |