Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

torvalds · torvalds · commit 01b883358ba4 · 2011-08-18T22:49:34.000-07:00
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc: fix array bounds error setting up PCIC NMI trap
diff --git a/arch/sparc/kernel/pcic.c b/arch/sparc/kernel/pcic.c
@@ -352,8 +352,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];

Original file line number	Diff line number	Diff line change
`@@ -352,8 +352,8 @@ int __init pcic_probe(void)`
`352`	`352`	`strcpy(pbm->prom_name, namebuf);`
`353`	`353`
`354`	`354`	`{`
`355`		`- extern volatile int t_nmi[1];`
`356`		`- extern int pcic_nmi_trap_patch[1];`
	`355`	`+ extern volatile int t_nmi[4];`
	`356`	`+ extern int pcic_nmi_trap_patch[4];`
`357`	`357`
`358`	`358`	`t_nmi[0] = pcic_nmi_trap_patch[0];`
`359`	`359`	`t_nmi[1] = pcic_nmi_trap_patch[1];`