[PATCH] ppc32: Move declarations into headers

From: Paul Mackerras <paulus@samba.org>

The patch below moves some declarations from C files into the appropriate
header file in include/asm-ppc (and removes an unused local variable in a
function).

diff --git a/arch/ppc/kernel/traps.c b/arch/ppc/kernel/traps.c
index 10ee8a3bb6292acf277cb22c114aac3c3e13bc33..24123cf545927b2046870002e8cd563232981f1c 100644 (file)
--- a/arch/ppc/kernel/traps.c
+++ b/arch/ppc/kernel/traps.c
@@ -41,9 +41,6 @@
 #include <asm/backlight.h>
 #endif
 
-extern int fix_alignment(struct pt_regs *);
-extern void bad_page_fault(struct pt_regs *, unsigned long, int sig);
-
 #ifdef CONFIG_XMON
 void (*debugger)(struct pt_regs *regs) = xmon;
 int (*debugger_bpt)(struct pt_regs *regs) = xmon_bpt;

diff --git a/arch/ppc/mm/fault.c b/arch/ppc/mm/fault.c
index c8cddee26e5b4840c2bbd1239144d5901b7187ec..1be8120b8bc4c729574750328f0bf604a17c4dfb 100644 (file)
--- a/arch/ppc/mm/fault.c
+++ b/arch/ppc/mm/fault.c
@@ -51,11 +51,6 @@ unsigned long pte_misses;    /* updated by do_page_fault() */
 unsigned long pte_errors;      /* updated by do_page_fault() */
 unsigned int probingmem;
 
-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);
-
 /*
  * Check whether the instruction at regs->nip is a store using
  * an update addressing form which will update r1.
@@ -331,7 +326,6 @@ do_sigbus:
 void
 bad_page_fault(struct pt_regs *regs, unsigned long address, int sig)
 {
-       extern void die(const char *,struct pt_regs *,long);
        const struct exception_table_entry *entry;
 
        /* Are we prepared to handle this fault?  */
@@ -358,7 +352,6 @@ pte_t *va_to_pte(unsigned long address)
        pgd_t *dir;
        pmd_t *pmd;
        pte_t *pte;
-       struct mm_struct *mm;
 
        if (address < TASK_SIZE)
                return NULL;

diff --git a/include/asm-ppc/pgtable.h b/include/asm-ppc/pgtable.h
index 98e9bb20e36e5e8f23abbe96442f8034e491aeb6..f4567e2f805577eadebd2743ffa03a3d674be9fc 100644 (file)
--- a/include/asm-ppc/pgtable.h
+++ b/include/asm-ppc/pgtable.h
@@ -672,6 +672,8 @@ extern void kernel_set_cachemode (unsigned long address, unsigned long size,
 
 typedef pte_t *pte_addr_t;
 
+extern int get_pteptr(struct mm_struct *mm, unsigned long addr, pte_t **ptep);
+
 #endif /* !__ASSEMBLY__ */
 
 #define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG

diff --git a/include/asm-ppc/system.h b/include/asm-ppc/system.h
index 3885c4d834231018c51ab76cffdc5058e231ce7a..ef8a0ccf52e2e61266b122659b4d5782a69a14f4 100644 (file)
--- a/include/asm-ppc/system.h
+++ b/include/asm-ppc/system.h
@@ -76,11 +76,15 @@ extern void giveup_fpu(struct task_struct *);
 extern void enable_kernel_fp(void);
 extern void giveup_altivec(struct task_struct *);
 extern void load_up_altivec(struct task_struct *);
+extern int fix_alignment(struct pt_regs *);
 extern void cvt_fd(float *from, double *to, unsigned long *fpscr);
 extern void cvt_df(double *from, float *to, unsigned long *fpscr);
 extern int call_rtas(const char *, int, int, unsigned long *, ...);
 extern int abs(int);
 extern void cacheable_memzero(void *p, unsigned int nb);
+extern void do_page_fault(struct pt_regs *, unsigned long, unsigned long);
+extern void bad_page_fault(struct pt_regs *, unsigned long, int);
+extern void die(const char *, struct pt_regs *, long);
 
 struct device_node;
 extern void note_scsi_host(struct device_node *, void *);