| From 2ca0a9a73698cfb46c212e764eaff17127b76332 Mon Sep 17 00:00:00 2001 |
| From: Ian Campbell <Ian.Campbell@citrix.com> |
| Date: Wed, 17 Aug 2011 22:14:57 +0000 |
| Subject: [PATCH] sparc: fix array bounds error setting up PCIC NMI trap |
| |
| commit 4a0342ca8e8150bd47e7118a76e300692a1b6b7b upstream. |
| |
| 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> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/arch/sparc/kernel/pcic.c b/arch/sparc/kernel/pcic.c |
| index d36a8d3..2479ecd 100644 |
| --- a/arch/sparc/kernel/pcic.c |
| +++ b/arch/sparc/kernel/pcic.c |
| @@ -349,8 +349,8 @@ int __init pcic_probe(void) |
| strcpy(pbm->prom_name, namebuf); |
| |
| { |
| - extern volatile int t_nmi[1]; |
| - extern int pcic_nmi_trap_patch[1]; |
| + extern volatile int t_nmi[4]; |
| + extern int pcic_nmi_trap_patch[4]; |
| |
| t_nmi[0] = pcic_nmi_trap_patch[0]; |
| t_nmi[1] = pcic_nmi_trap_patch[1]; |
| -- |
| 1.7.12.rc1.1.gbce1580 |
| |
