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

Commit 01b88335 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc: fix array bounds error setting up PCIC NMI trap
parents 2c4ac99f 4a0342ca

arch/sparc/kernel/pcic.c

+2 −2
Original line number Diff line number Diff line
@@ -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];