summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-12-11 20:23:25 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-12-11 20:23:25 -0800
commitfe3f2053fd42148b3ebb7b90de5f20eaf3393860 (patch)
tree8915aff27ef95943659565eff008f4a81e00577a /include
parent7fc7e2eeecb599ba719c4c4503100fc8cd6a6920 (diff)
parentef969434005e772218c0b8086539804605070fa8 (diff)
downloadop-kernel-dev-fe3f2053fd42148b3ebb7b90de5f20eaf3393860.zip
op-kernel-dev-fe3f2053fd42148b3ebb7b90de5f20eaf3393860.tar.gz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'include')
-rw-r--r--include/asm-powerpc/mmu.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-powerpc/mmu.h b/include/asm-powerpc/mmu.h
index c1b4bba..29b0bb0 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,
unsigned int local);
struct mm_struct;
extern int hash_huge_page(struct mm_struct *mm, unsigned long access,
- unsigned long ea, unsigned long vsid, int local);
+ unsigned long ea, unsigned long vsid, int local,
+ unsigned long trap);
extern void htab_finish_init(void);
extern int htab_bolt_mapping(unsigned long vstart, unsigned long vend,
OpenPOWER on IntegriCloud