diff options
| author | Sam Ravnborg <sam@ravnborg.org> | 2016-04-22 19:41:05 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-05-21 02:55:41 +0200 |
| commit | 3c46e2d61cfc389dc6e000489fcfcaea805710e0 (patch) | |
| tree | 6e54066ddbba86ad77ea4fdcce02695faa675188 | |
| parent | sparc32: drop local prototype in kgdb_32 (diff) | |
| download | linux-3c46e2d61cfc389dc6e000489fcfcaea805710e0.tar.xz linux-3c46e2d61cfc389dc6e000489fcfcaea805710e0.zip | |
sparc32: use proper prototype for trapbase
This killed an extern ... in a .c file.
No functional change.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | arch/sparc/kernel/kernel.h | 1 | ||||
| -rw-r--r-- | arch/sparc/kernel/kgdb_32.c | 3 | ||||
| -rw-r--r-- | arch/sparc/kernel/setup_32.c | 4 |
3 files changed, 3 insertions, 5 deletions
diff --git a/arch/sparc/kernel/kernel.h b/arch/sparc/kernel/kernel.h index 5057ec2e4af6..c9804551262c 100644 --- a/arch/sparc/kernel/kernel.h +++ b/arch/sparc/kernel/kernel.h @@ -127,6 +127,7 @@ extern unsigned int t_nmi[]; extern unsigned int linux_trap_ipi15_sun4d[]; extern unsigned int linux_trap_ipi15_sun4m[]; +extern struct tt_entry trapbase; extern struct tt_entry trapbase_cpu1; extern struct tt_entry trapbase_cpu2; extern struct tt_entry trapbase_cpu3; diff --git a/arch/sparc/kernel/kgdb_32.c b/arch/sparc/kernel/kgdb_32.c index 8602e8874de5..6e8e318c57be 100644 --- a/arch/sparc/kernel/kgdb_32.c +++ b/arch/sparc/kernel/kgdb_32.c @@ -12,10 +12,9 @@ #include <asm/irq.h> #include <asm/cacheflush.h> +#include "kernel.h" #include "entry.h" -extern unsigned long trapbase; - void pt_regs_to_gdb_regs(unsigned long *gdb_regs, struct pt_regs *regs) { struct reg_window32 *win; diff --git a/arch/sparc/kernel/setup_32.c b/arch/sparc/kernel/setup_32.c index 69d75ff1c25c..c4e65cb3280f 100644 --- a/arch/sparc/kernel/setup_32.c +++ b/arch/sparc/kernel/setup_32.c @@ -68,8 +68,6 @@ struct screen_info screen_info = { * prints out pretty messages and returns. */ -extern unsigned long trapbase; - /* Pretty sick eh? */ static void prom_sync_me(void) { @@ -300,7 +298,7 @@ void __init setup_arch(char **cmdline_p) int i; unsigned long highest_paddr; - sparc_ttable = (struct tt_entry *) &trapbase; + sparc_ttable = &trapbase; /* Initialize PROM console and command line. */ *cmdline_p = prom_getbootargs(); |