Commit 4a0342ca authored Aug 17, 2011 by Ian Campbell Committed by David S. Miller Aug 18, 2011

sparc: fix array bounds error setting up PCIC NMI trap

CC arch/sparc/kernel/pcic.o
arch/sparc/kernel/pcic.c: In function 'pcic_probe':
arch/sparc/kernel/pcic.c:359:33: error: array subscript is above array bounds [-Werror=array-bounds]
arch/sparc/kernel/pcic.c:359:8: error: array subscript is above array bounds [-Werror=array-bounds]
arch/sparc/kernel/pcic.c:360:33: error: array subscript is above array bounds [-Werror=array-bounds]
arch/sparc/kernel/pcic.c:360:8: error: array subscript is above array bounds [-Werror=array-bounds]
arch/sparc/kernel/pcic.c:361:33: error: array subscript is above array bounds [-Werror=array-bounds]
arch/sparc/kernel/pcic.c:361:8: error: array subscript is above array bounds [-Werror=array-bounds]
cc1: all warnings being treated as errors

I'm not particularly familiar with sparc but t_nmi (defined in head_32.S via
the TRAP_ENTRY macro) and pcic_nmi_trap_patch (defined in entry.S) both appear
to be 4 instructions long and I presume from the usage that instructions are
int sized.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: sparclinux@vger.kernel.org
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 178a2960

arch/sparc/kernel/pcic.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -352,8 +352,8 @@ int __init pcic_probe(void)
	strcpy(pbm->prom_name, namebuf);		strcpy(pbm->prom_name, namebuf);

	{		{
	extern volatile int t_nmi[1];		extern volatile int t_nmi[4];
	extern int pcic_nmi_trap_patch[1];		extern int pcic_nmi_trap_patch[4];

	t_nmi[0] = pcic_nmi_trap_patch[0];		t_nmi[0] = pcic_nmi_trap_patch[0];
	t_nmi[1] = pcic_nmi_trap_patch[1];		t_nmi[1] = pcic_nmi_trap_patch[1];