diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-12-03 12:54:45 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-12-03 12:54:45 +0100 |
commit | c36910c147fd7b129a8f1269c76b9767c99de5cd (patch) | |
tree | 29403cd341b62581718f6b34944271980fb133e6 /arch/powerpc/include/asm/mmu-hash64.h | |
parent | 70d7d357578245f1993fd2d3ccd26088bcd38941 (diff) | |
parent | 09ee17eb8ea89514c13980c4010bdbbaea8630c2 (diff) | |
download | op-kernel-dev-c36910c147fd7b129a8f1269c76b9767c99de5cd.zip op-kernel-dev-c36910c147fd7b129a8f1269c76b9767c99de5cd.tar.gz |
Merge branch 'iommu-fixes-2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into x86/urgent
Diffstat (limited to 'arch/powerpc/include/asm/mmu-hash64.h')
-rw-r--r-- | arch/powerpc/include/asm/mmu-hash64.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/mmu-hash64.h b/arch/powerpc/include/asm/mmu-hash64.h index 5a44174..68b7526 100644 --- a/arch/powerpc/include/asm/mmu-hash64.h +++ b/arch/powerpc/include/asm/mmu-hash64.h @@ -280,7 +280,6 @@ extern int hash_huge_page(struct mm_struct *mm, unsigned long access, extern int htab_bolt_mapping(unsigned long vstart, unsigned long vend, unsigned long pstart, unsigned long prot, int psize, int ssize); -extern void set_huge_psize(int psize); extern void add_gpage(unsigned long addr, unsigned long page_size, unsigned long number_of_pages); extern void demote_segment_4k(struct mm_struct *mm, unsigned long addr); |