# This is a BitKeeper generated patch for the following project: # Project Name: Linux 2.4 for PowerPC development tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.1179 -> 1.1180 # include/asm-ppc/pgtable.h 1.52 -> 1.53 # arch/ppc/mm/fault.c 1.28 -> 1.29 # # The following is the BitKeeper ChangeSet Log # -------------------------------------------- # 03/01/06 hollis@granite.austin.ibm.com 1.1180 # move get_pteptr prototype to pgtable.h # -------------------------------------------- # diff -Nru a/arch/ppc/mm/fault.c b/arch/ppc/mm/fault.c --- a/arch/ppc/mm/fault.c Mon Jan 6 16:46:23 2003 +++ b/arch/ppc/mm/fault.c Mon Jan 6 16:46:23 2003 @@ -55,7 +55,6 @@ extern void die_if_kernel(char *, struct pt_regs *, long); void bad_page_fault(struct pt_regs *, unsigned long, int sig); void do_page_fault(struct pt_regs *, unsigned long, unsigned long); -extern int get_pteptr(struct mm_struct *mm, unsigned long addr, pte_t **ptep); /* * For 600- and 800-family processors, the error_code parameter is DSISR diff -Nru a/include/asm-ppc/pgtable.h b/include/asm-ppc/pgtable.h --- a/include/asm-ppc/pgtable.h Mon Jan 6 16:46:23 2003 +++ b/include/asm-ppc/pgtable.h Mon Jan 6 16:46:23 2003 @@ -112,6 +112,7 @@ extern unsigned long va_to_phys(unsigned long address); extern pte_t *va_to_pte(unsigned long address); extern unsigned long ioremap_bot, ioremap_base; +extern int get_pteptr(struct mm_struct *mm, unsigned long addr, pte_t **ptep); #endif /* __ASSEMBLY__ */ /*