Module Name: src
Committed By: skrll
Date: Sun Sep 16 09:25:48 UTC 2018
Modified Files:
src/sys/arch/arm/broadcom: bcm53xx_reg.h
src/sys/arch/arm/imx: imx6_ccmreg.h
src/sys/arch/arm/omap: omap4430_intr.h omap5430_intr.h
src/sys/arch/arm/zynq: zynq7000_board.c
src/sys/arch/mips/include: cpu.h
src/sys/arch/mips/rmi: rmixl_iobus.c
src/sys/arch/powerpc/booke: e500_intr.c
src/sys/arch/powerpc/powerpc: powerpc_machdep.c
src/sys/arch/usermode/usermode: pmap.c
src/sys/dev/pci: if_lmc.h
src/sys/dev/usb: ehci.c
src/sys/netinet: sctp_output.c
Log Message:
interrupt has two 'r's
fix another typo while I'm here (flsah)
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/broadcom/bcm53xx_reg.h
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/imx/imx6_ccmreg.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/omap/omap4430_intr.h \
src/sys/arch/arm/omap/omap5430_intr.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/zynq/zynq7000_board.c
cvs rdiff -u -r1.125 -r1.126 src/sys/arch/mips/include/cpu.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/mips/rmi/rmixl_iobus.c
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/powerpc/booke/e500_intr.c
cvs rdiff -u -r1.71 -r1.72 src/sys/arch/powerpc/powerpc/powerpc_machdep.c
cvs rdiff -u -r1.113 -r1.114 src/sys/arch/usermode/usermode/pmap.c
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/pci/if_lmc.h
cvs rdiff -u -r1.262 -r1.263 src/sys/dev/usb/ehci.c
cvs rdiff -u -r1.16 -r1.17 src/sys/netinet/sctp_output.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/broadcom/bcm53xx_reg.h
diff -u src/sys/arch/arm/broadcom/bcm53xx_reg.h:1.16 src/sys/arch/arm/broadcom/bcm53xx_reg.h:1.17
--- src/sys/arch/arm/broadcom/bcm53xx_reg.h:1.16 Wed Mar 26 03:18:56 2014
+++ src/sys/arch/arm/broadcom/bcm53xx_reg.h Sun Sep 16 09:25:46 2018
@@ -727,7 +727,7 @@ struct gmac_txdb {
};
#define TXDB_FLAG_SF __BIT(31) // Start oF Frame
#define TXDB_FLAG_EF __BIT(30) // End oF Frame
-#define TXDB_FLAG_IC __BIT(29) // Interupt on Completetion
+#define TXDB_FLAG_IC __BIT(29) // Interrupt on Completetion
#define TXDB_FLAG_ET __BIT(28) // End Of Table
struct gmac_rxdb {
Index: src/sys/arch/arm/imx/imx6_ccmreg.h
diff -u src/sys/arch/arm/imx/imx6_ccmreg.h:1.8 src/sys/arch/arm/imx/imx6_ccmreg.h:1.9
--- src/sys/arch/arm/imx/imx6_ccmreg.h:1.8 Wed Jun 20 07:05:37 2018
+++ src/sys/arch/arm/imx/imx6_ccmreg.h Sun Sep 16 09:25:46 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: imx6_ccmreg.h,v 1.8 2018/06/20 07:05:37 hkenken Exp $ */
+/* $NetBSD: imx6_ccmreg.h,v 1.9 2018/09/16 09:25:46 skrll Exp $ */
/*
* Copyright (c) 2014 Ryo Shimizu <[email protected]>
@@ -32,7 +32,7 @@
#include <sys/cdefs.h>
/*
- * PERIPHCLK_N is an arm root clock divider for MPcore interupt controller.
+ * PERIPHCLK_N is an arm root clock divider for MPcore interrupt controller.
* PERIPHCLK_N is equal to, or greater than two.
* see "Cortex-A9 MPCore Technical Reference Manual" -
* Chapter 5: Clocks, Resets, and Power Management, 5.1: Clocks.
Index: src/sys/arch/arm/omap/omap4430_intr.h
diff -u src/sys/arch/arm/omap/omap4430_intr.h:1.3 src/sys/arch/arm/omap/omap4430_intr.h:1.4
--- src/sys/arch/arm/omap/omap4430_intr.h:1.3 Thu Apr 9 21:33:54 2015
+++ src/sys/arch/arm/omap/omap4430_intr.h Sun Sep 16 09:25:46 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: omap4430_intr.h,v 1.3 2015/04/09 21:33:54 matt Exp $ */
+/* $NetBSD: omap4430_intr.h,v 1.4 2018/09/16 09:25:46 skrll Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -144,7 +144,7 @@
#define IRQ_EMIF2 (32+111) // EMIF2 interrupt
#define IRQ_MCPDM (32+112) // MCPDM interrupt
#define IRQ_DMM (32+113) // DMM interrupt
-#define IRQ_DMIC (32+114) // DMIC interupt
+#define IRQ_DMIC (32+114) // DMIC interrupt
#define IRQ_SYS_NIRQ2 (32+119) // External interrupt 2 (active low)
#define IRQ_KBD_CTL (32+120) // Keyboard controller interrupt
Index: src/sys/arch/arm/omap/omap5430_intr.h
diff -u src/sys/arch/arm/omap/omap5430_intr.h:1.3 src/sys/arch/arm/omap/omap5430_intr.h:1.4
--- src/sys/arch/arm/omap/omap5430_intr.h:1.3 Thu Apr 9 21:33:54 2015
+++ src/sys/arch/arm/omap/omap5430_intr.h Sun Sep 16 09:25:46 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: omap5430_intr.h,v 1.3 2015/04/09 21:33:54 matt Exp $ */
+/* $NetBSD: omap5430_intr.h,v 1.4 2018/09/16 09:25:46 skrll Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -141,11 +141,11 @@
#define IRQ_EMIF2 IRQ_SPI(111) // EMIF2 interrupt
#define IRQ_MCPDM IRQ_SPI(112) // MCPDM interrupt
#define IRQ_DMM IRQ_SPI(113) // DMM interrupt
-#define IRQ_DMIC IRQ_SPI(114) // DMIC interupt
+#define IRQ_DMIC IRQ_SPI(114) // DMIC interrupt
#define IRQ_SYS_NIRQ2 IRQ_SPI(119) // External interrupt 2 (active low)
#define IRQ_KBD_CTL IRQ_SPI(120) // Keyboard controller interrupt
-#define IRQ_GPIO8 IRQ_SPI(121) // GPIO8 interupt
-#define IRQ_BB2D IRQ_SPI(125) // BB2D interupt
+#define IRQ_GPIO8 IRQ_SPI(121) // GPIO8 interrupt
+#define IRQ_BB2D IRQ_SPI(125) // BB2D interrupt
#endif /* _LOCORE */
Index: src/sys/arch/arm/zynq/zynq7000_board.c
diff -u src/sys/arch/arm/zynq/zynq7000_board.c:1.3 src/sys/arch/arm/zynq/zynq7000_board.c:1.4
--- src/sys/arch/arm/zynq/zynq7000_board.c:1.3 Tue Jun 5 08:03:28 2018
+++ src/sys/arch/arm/zynq/zynq7000_board.c Sun Sep 16 09:25:46 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: zynq7000_board.c,v 1.3 2018/06/05 08:03:28 hkenken Exp $ */
+/* $NetBSD: zynq7000_board.c,v 1.4 2018/09/16 09:25:46 skrll Exp $ */
/*-
* Copyright (c) 2015 Genetec Corporation. All rights reserved.
* Written by Hashimoto Kenichi for Genetec Corporation.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: zynq7000_board.c,v 1.3 2018/06/05 08:03:28 hkenken Exp $");
+__KERNEL_RCSID(1, "$NetBSD: zynq7000_board.c,v 1.4 2018/09/16 09:25:46 skrll Exp $");
#include "opt_zynq.h"
#include "arml2cc.h"
@@ -45,7 +45,7 @@ __KERNEL_RCSID(1, "$NetBSD: zynq7000_boa
#include <arm/zynq/zynq7000_reg.h>
/*
- * PERIPHCLK_N is an arm root clock divider for MPcore interupt controller.
+ * PERIPHCLK_N is an arm root clock divider for MPcore interrupt controller.
* PERIPHCLK_N is equal to, or greater than two.
* see "Cortex-A9 MPCore Technical Reference Manual" -
* Chapter 5: Clocks, Resets, and Power Management, 5.1: Clocks.
Index: src/sys/arch/mips/include/cpu.h
diff -u src/sys/arch/mips/include/cpu.h:1.125 src/sys/arch/mips/include/cpu.h:1.126
--- src/sys/arch/mips/include/cpu.h:1.125 Wed Aug 22 01:05:22 2018
+++ src/sys/arch/mips/include/cpu.h Sun Sep 16 09:25:46 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.125 2018/08/22 01:05:22 msaitoh Exp $ */
+/* $NetBSD: cpu.h,v 1.126 2018/09/16 09:25:46 skrll Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -200,17 +200,17 @@ register struct lwp *mips_curlwp asm(MIP
*/
/*
- * Send an inter-processor interupt to each other CPU (excludes curcpu())
+ * Send an inter-processor interrupt to each other CPU (excludes curcpu())
*/
void cpu_broadcast_ipi(int);
/*
- * Send an inter-processor interupt to CPUs in kcpuset (excludes curcpu())
+ * Send an inter-processor interrupt to CPUs in kcpuset (excludes curcpu())
*/
void cpu_multicast_ipi(const kcpuset_t *, int);
/*
- * Send an inter-processor interupt to another CPU.
+ * Send an inter-processor interrupt to another CPU.
*/
int cpu_send_ipi(struct cpu_info *, int);
Index: src/sys/arch/mips/rmi/rmixl_iobus.c
diff -u src/sys/arch/mips/rmi/rmixl_iobus.c:1.3 src/sys/arch/mips/rmi/rmixl_iobus.c:1.4
--- src/sys/arch/mips/rmi/rmixl_iobus.c:1.3 Fri Jul 1 19:01:31 2011
+++ src/sys/arch/mips/rmi/rmixl_iobus.c Sun Sep 16 09:25:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_iobus.c,v 1.3 2011/07/01 19:01:31 dyoung Exp $ */
+/* $NetBSD: rmixl_iobus.c,v 1.4 2018/09/16 09:25:47 skrll Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_iobus.c,v 1.3 2011/07/01 19:01:31 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_iobus.c,v 1.4 2018/09/16 09:25:47 skrll Exp $");
#include "locators.h"
@@ -150,7 +150,7 @@ rmixl_iobus_attach(device_t parent, devi
rmixl_iobus_bus_mem_init(&rcp->rc_iobus_memt, rcp);
sc->sc_iobus_bst = (bus_space_tag_t)&rcp->rc_iobus_memt;
- /* disable all Flsah interupts */
+ /* disable all Flash interrupts */
bus_space_write_4(sc->sc_obio_bst, sc->sc_obio_bsh,
RMIXL_FLASH_INT_MASK, 0);
Index: src/sys/arch/powerpc/booke/e500_intr.c
diff -u src/sys/arch/powerpc/booke/e500_intr.c:1.37 src/sys/arch/powerpc/booke/e500_intr.c:1.38
--- src/sys/arch/powerpc/booke/e500_intr.c:1.37 Fri Jan 26 17:49:55 2018
+++ src/sys/arch/powerpc/booke/e500_intr.c Sun Sep 16 09:25:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: e500_intr.c,v 1.37 2018/01/26 17:49:55 flxd Exp $ */
+/* $NetBSD: e500_intr.c,v 1.38 2018/09/16 09:25:47 skrll Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -41,7 +41,7 @@
#define __INTR_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: e500_intr.c,v 1.37 2018/01/26 17:49:55 flxd Exp $");
+__KERNEL_RCSID(0, "$NetBSD: e500_intr.c,v 1.38 2018/09/16 09:25:47 skrll Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -1370,7 +1370,7 @@ e500_intr_cpu_hatch(struct cpu_info *ci)
{
char iname[INTRIDBUF];
- /* Initialize percpu interupts. */
+ /* Initialize percpu interrupts. */
e500_intr_init_precpu();
/*
Index: src/sys/arch/powerpc/powerpc/powerpc_machdep.c
diff -u src/sys/arch/powerpc/powerpc/powerpc_machdep.c:1.71 src/sys/arch/powerpc/powerpc/powerpc_machdep.c:1.72
--- src/sys/arch/powerpc/powerpc/powerpc_machdep.c:1.71 Fri Jan 23 07:27:05 2015
+++ src/sys/arch/powerpc/powerpc/powerpc_machdep.c Sun Sep 16 09:25:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: powerpc_machdep.c,v 1.71 2015/01/23 07:27:05 nonaka Exp $ */
+/* $NetBSD: powerpc_machdep.c,v 1.72 2018/09/16 09:25:47 skrll Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: powerpc_machdep.c,v 1.71 2015/01/23 07:27:05 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: powerpc_machdep.c,v 1.72 2018/09/16 09:25:47 skrll Exp $");
#include "opt_altivec.h"
#include "opt_ddb.h"
@@ -533,7 +533,7 @@ CTASSERT(MAXCPUS <= 32);
#define CPUSET_EXPORT(kset, set) kcpuset_export_u32((kset), &(set), sizeof(set))
/*
- * Send an inter-processor interupt to CPUs in cpuset (excludes curcpu())
+ * Send an inter-processor interrupt to CPUs in cpuset (excludes curcpu())
*/
static void
cpu_multicast_ipi(__cpuset_t cpuset, uint32_t msg)
Index: src/sys/arch/usermode/usermode/pmap.c
diff -u src/sys/arch/usermode/usermode/pmap.c:1.113 src/sys/arch/usermode/usermode/pmap.c:1.114
--- src/sys/arch/usermode/usermode/pmap.c:1.113 Sun Aug 5 16:51:59 2018
+++ src/sys/arch/usermode/usermode/pmap.c Sun Sep 16 09:25:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.113 2018/08/05 16:51:59 reinoud Exp $ */
+/* $NetBSD: pmap.c,v 1.114 2018/09/16 09:25:47 skrll Exp $ */
/*-
* Copyright (c) 2011 Reinoud Zandijk <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.113 2018/08/05 16:51:59 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.114 2018/09/16 09:25:47 skrll Exp $");
#include "opt_memsize.h"
#include "opt_kmempages.h"
@@ -898,7 +898,7 @@ pmap_do_enter(pmap_t pmap, vaddr_t va, p
panic("pmap_do_enter: invalid va isued\n");
#endif
- /* raise interupt level */
+ /* raise interrupt level */
s = splvm();
/* remove existing mapping at this lpn */
Index: src/sys/dev/pci/if_lmc.h
diff -u src/sys/dev/pci/if_lmc.h:1.25 src/sys/dev/pci/if_lmc.h:1.26
--- src/sys/dev/pci/if_lmc.h:1.25 Mon Jun 25 09:32:28 2018
+++ src/sys/dev/pci/if_lmc.h Sun Sep 16 09:25:47 2018
@@ -1,5 +1,5 @@
/*-
- * $NetBSD: if_lmc.h,v 1.25 2018/06/25 09:32:28 msaitoh Exp $
+ * $NetBSD: if_lmc.h,v 1.26 2018/09/16 09:25:47 skrll Exp $
*
* Copyright (c) 2002-2006 David Boggs. ([email protected])
* All rights reserved.
@@ -238,14 +238,14 @@
/* T3 GPIO bits */
#define GPIO_T3_DAC 0x04 /* DAC chip select */
-#define GPIO_T3_INTEN 0x08 /* Framer Interupt enable */
+#define GPIO_T3_INTEN 0x08 /* Framer Interrupt enable */
/* SSI GPIO bits */
#define GPIO_SSI_SYNTH 0x04 /* Synth osc chip select */
#define GPIO_SSI_DCE 0x08 /* provide clock on TXCLOCK output */
/* T1E1 GPIO bits */
-#define GPIO_T1_INTEN 0x08 /* Framer Interupt enable */
+#define GPIO_T1_INTEN 0x08 /* Framer Interrupt enable */
/* MII register 16 bits common to all cards */
/* NB: LEDs for HSSI & SSI are in DIFFERENT bits than for T1E1 & T3; oops */
Index: src/sys/dev/usb/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.262 src/sys/dev/usb/ehci.c:1.263
--- src/sys/dev/usb/ehci.c:1.262 Mon Sep 3 16:29:33 2018
+++ src/sys/dev/usb/ehci.c Sun Sep 16 09:25:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci.c,v 1.262 2018/09/03 16:29:33 riastradh Exp $ */
+/* $NetBSD: ehci.c,v 1.263 2018/09/16 09:25:47 skrll Exp $ */
/*
* Copyright (c) 2004-2012 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.262 2018/09/03 16:29:33 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.263 2018/09/16 09:25:47 skrll Exp $");
#include "ohci.h"
#include "uhci.h"
@@ -638,7 +638,7 @@ ehci_init(ehci_softc_t *sc)
}
/* Enable interrupts */
- DPRINTF("enabling interupts", 0, 0, 0, 0);
+ DPRINTF("enabling interrupts", 0, 0, 0, 0);
EOWRITE4(sc, EHCI_USBINTR, sc->sc_eintrs);
return 0;
Index: src/sys/netinet/sctp_output.c
diff -u src/sys/netinet/sctp_output.c:1.16 src/sys/netinet/sctp_output.c:1.17
--- src/sys/netinet/sctp_output.c:1.16 Mon Sep 3 16:29:36 2018
+++ src/sys/netinet/sctp_output.c Sun Sep 16 09:25:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sctp_output.c,v 1.16 2018/09/03 16:29:36 riastradh Exp $ */
+/* $NetBSD: sctp_output.c,v 1.17 2018/09/16 09:25:47 skrll Exp $ */
/* $KAME: sctp_output.c,v 1.48 2005/06/16 18:29:24 jinmei Exp $ */
/*
@@ -30,7 +30,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sctp_output.c,v 1.16 2018/09/03 16:29:36 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sctp_output.c,v 1.17 2018/09/16 09:25:47 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_ipsec.h"
@@ -1715,7 +1715,7 @@ sctp_choose_v6_boundall(struct sctp_inpc
num_eligible_addr = 0;
bound_all_v6_plan_b:
/* ok, if we reach here we either fell through
- * due to something changing during an interupt (unlikely)
+ * due to something changing during an interrupt (unlikely)
* or we have NO eligible source addresses for the ifn
* of the route (most likely). We must look at all the other
* interfaces EXCEPT rt->rt_ifp and do the same game.
