Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3c46e2d6 authored by Sam Ravnborg's avatar Sam Ravnborg Committed by David S. Miller
Browse files

sparc32: use proper prototype for trapbase 



This killed an extern ... in a .c file.
No functional change.

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 06fc7b50

arch/sparc/kernel/kernel.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -127,6 +127,7 @@ extern unsigned int t_nmi[]; 
extern unsigned int linux_trap_ipi15_sun4d[];

extern unsigned int linux_trap_ipi15_sun4d[];

extern unsigned int linux_trap_ipi15_sun4m[];

extern unsigned int linux_trap_ipi15_sun4m[];





extern struct tt_entry trapbase;

extern struct tt_entry trapbase_cpu1;

extern struct tt_entry trapbase_cpu1;

extern struct tt_entry trapbase_cpu2;

extern struct tt_entry trapbase_cpu2;

extern struct tt_entry trapbase_cpu3;

extern struct tt_entry trapbase_cpu3;

arch/sparc/kernel/kgdb_32.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -12,10 +12,9 @@ 
#include <asm/irq.h>

#include <asm/irq.h>

#include <asm/cacheflush.h>

#include <asm/cacheflush.h>





#include "kernel.h"

#include "entry.h"

#include "entry.h"





extern unsigned long trapbase;



void pt_regs_to_gdb_regs(unsigned long *gdb_regs, struct pt_regs *regs)

void pt_regs_to_gdb_regs(unsigned long *gdb_regs, struct pt_regs *regs)

{

{

	struct reg_window32 *win;

	struct reg_window32 *win;

arch/sparc/kernel/setup_32.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -68,8 +68,6 @@ struct screen_info screen_info = { 
 * prints out pretty messages and returns.

 * prints out pretty messages and returns.

 */

 */





extern unsigned long trapbase;



/* Pretty sick eh? */

/* Pretty sick eh? */

static void prom_sync_me(void)

static void prom_sync_me(void)

{

{
@@ -300,7 +298,7 @@ void __init setup_arch(char **cmdline_p) 
	int i;

	int i;

	unsigned long highest_paddr;

	unsigned long highest_paddr;





	sparc_ttable = (struct tt_entry *) &trapbase;

	sparc_ttable = &trapbase;





	/* Initialize PROM console and command line. */

	/* Initialize PROM console and command line. */

	*cmdline_p = prom_getbootargs();

	*cmdline_p = prom_getbootargs();