diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-18 22:49:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-18 22:49:34 -0700 |
| commit | 01b883358ba4b616d9d161b43af4bb5ee8124fe8 (patch) | |
| tree | 72f3efdd8da22c75d68d2f48d4e47ae03d267bd1 /arch | |
| parent | 2c4ac99f983f1341b5962a16b5e8de6049bf10b5 (diff) | |
| parent | 4a0342ca8e8150bd47e7118a76e300692a1b6b7b (diff) | |
| download | blackbird-op-linux-01b883358ba4b616d9d161b43af4bb5ee8124fe8.tar.gz blackbird-op-linux-01b883358ba4b616d9d161b43af4bb5ee8124fe8.zip | |
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
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sparc/kernel/pcic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/kernel/pcic.c b/arch/sparc/kernel/pcic.c index a19f04195478..1aaf8c180be5 100644 --- 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]; |
