Module Name: src
Committed By: riz
Date: Tue Oct 23 16:27:16 UTC 2012
Modified Files:
src/sys/arch/arm/marvell [netbsd-6]: kirkwood.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #620):
sys/arch/arm/marvell/kirkwood.c: revision 1.7
Add missing ','
It will fix a bug that "vmstat -e" shows the incorrect counts in wrong
entries.
To generate a diff of this commit:
cvs rdiff -u -r1.4.10.1 -r1.4.10.2 src/sys/arch/arm/marvell/kirkwood.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/marvell/kirkwood.c
diff -u src/sys/arch/arm/marvell/kirkwood.c:1.4.10.1 src/sys/arch/arm/marvell/kirkwood.c:1.4.10.2
--- src/sys/arch/arm/marvell/kirkwood.c:1.4.10.1 Sat Oct 20 22:31:05 2012
+++ src/sys/arch/arm/marvell/kirkwood.c Tue Oct 23 16:27:15 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: kirkwood.c,v 1.4.10.1 2012/10/20 22:31:05 riz Exp $ */
+/* $NetBSD: kirkwood.c,v 1.4.10.2 2012/10/23 16:27:15 riz Exp $ */
/*
* Copyright (c) 2010 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kirkwood.c,v 1.4.10.1 2012/10/20 22:31:05 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kirkwood.c,v 1.4.10.2 2012/10/23 16:27:15 riz Exp $");
#define _INTR_PRIVATE
@@ -64,15 +64,15 @@ static const char * const sources[64] =
"GbE1Rx(16)", "GbE1Tx(17)", "GbE1Misc(18)", "USB0Cnt(19)",
"Reserved(20)", "Sata(21)", "SecurityInt(22)", "SPIInt(23)",
"AudioINT(24)", "Reserved(25)", "TS0Int(26)", "Reserved(27)",
- "SDIOInt(28)", "TWSI(29)", "AVBInt(30)", "TDMInt(31)"
+ "SDIOInt(28)", "TWSI(29)", "AVBInt(30)", "TDMInt(31)",
- "Reserved(32)", "Uart0Int(33)", "Uart1Int(34)", "GPIOLo7_0(35)"
- "GPIOLo8_15(36)", "GPIOLo16_23(37)", "GPIOLo24_31(38)", "GPIOHi7_0(39)"
- "GPIOHi8_15(40)", "GPIOHi16_23(41)", "XOR0Err(42)", "XOR1Err(43)"
- "PEX0Err(44)", "Reserved(45)", "GbE0Err(46)", "GbE1Err(47)"
- "USBErr(48)", "SecurityErr(49)", "AudioErr(50)", "Reserved(51)"
- "Reserved(52)", "RTCInt(53)", "Reserved(54)", "Reserved(55)"
- "Reserved(56)", "Reserved(57)", "Reserved(58)", "Reserved(59)"
+ "Reserved(32)", "Uart0Int(33)", "Uart1Int(34)", "GPIOLo7_0(35)",
+ "GPIOLo8_15(36)", "GPIOLo16_23(37)", "GPIOLo24_31(38)", "GPIOHi7_0(39)",
+ "GPIOHi8_15(40)", "GPIOHi16_23(41)", "XOR0Err(42)", "XOR1Err(43)",
+ "PEX0Err(44)", "Reserved(45)", "GbE0Err(46)", "GbE1Err(47)",
+ "USBErr(48)", "SecurityErr(49)", "AudioErr(50)", "Reserved(51)",
+ "Reserved(52)", "RTCInt(53)", "Reserved(54)", "Reserved(55)",
+ "Reserved(56)", "Reserved(57)", "Reserved(58)", "Reserved(59)",
"Reserved(60)", "Reserved(61)", "Reserved(62)", "Reserved(63)"
};
