Module Name: src
Committed By: mbalmer
Date: Tue Jan 5 13:20:30 UTC 2010
Modified Files:
src/sys/arch/hp700/dev: apic.c
src/sys/arch/powerpc/powerpc: trap.c
src/sys/arch/shark/shark: sequoia.c
src/sys/arch/vax/vax: trap.c
src/sys/arch/x86/x86: mpacpi.c
Log Message:
One semicolon only (;; -> ;)
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/hp700/dev/apic.c
cvs rdiff -u -r1.131 -r1.132 src/sys/arch/powerpc/powerpc/trap.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/shark/shark/sequoia.c
cvs rdiff -u -r1.121 -r1.122 src/sys/arch/vax/vax/trap.c
cvs rdiff -u -r1.79 -r1.80 src/sys/arch/x86/x86/mpacpi.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/hp700/dev/apic.c
diff -u src/sys/arch/hp700/dev/apic.c:1.5 src/sys/arch/hp700/dev/apic.c:1.6
--- src/sys/arch/hp700/dev/apic.c:1.5 Thu Dec 3 11:54:09 2009
+++ src/sys/arch/hp700/dev/apic.c Tue Jan 5 13:20:29 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: apic.c,v 1.5 2009/12/03 11:54:09 skrll Exp $ */
+/* $NetBSD: apic.c,v 1.6 2010/01/05 13:20:29 mbalmer Exp $ */
/* $OpenBSD: apic.c,v 1.7 2007/10/06 23:50:54 krw Exp $ */
@@ -138,7 +138,7 @@
#endif
line = PCI_INTERRUPT_LINE(reg);
if (sc->sc_irq[line] == 0)
- sc->sc_irq[line] = hp700_intr_allocate_bit(&int_reg_cpu);;
+ sc->sc_irq[line] = hp700_intr_allocate_bit(&int_reg_cpu);
*ihp = (line << APIC_INT_LINE_SHIFT) | sc->sc_irq[line];
return (APIC_INT_IRQ(*ihp) == 0);
}
Index: src/sys/arch/powerpc/powerpc/trap.c
diff -u src/sys/arch/powerpc/powerpc/trap.c:1.131 src/sys/arch/powerpc/powerpc/trap.c:1.132
--- src/sys/arch/powerpc/powerpc/trap.c:1.131 Sat Nov 21 17:40:29 2009
+++ src/sys/arch/powerpc/powerpc/trap.c Tue Jan 5 13:20:29 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.131 2009/11/21 17:40:29 rmind Exp $ */
+/* $NetBSD: trap.c,v 1.132 2010/01/05 13:20:29 mbalmer Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.131 2009/11/21 17:40:29 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.132 2010/01/05 13:20:29 mbalmer Exp $");
#include "opt_altivec.h"
#include "opt_ddb.h"
@@ -236,7 +236,7 @@
}
if (l->l_flag & LW_SA) {
- l->l_savp->savp_faultaddr = (vaddr_t)frame->dar;;
+ l->l_savp->savp_faultaddr = (vaddr_t)frame->dar;
l->l_pflag |= LP_SA_PAGEFAULT;
}
rv = uvm_fault(map, trunc_page(frame->dar), ftype);
Index: src/sys/arch/shark/shark/sequoia.c
diff -u src/sys/arch/shark/shark/sequoia.c:1.10 src/sys/arch/shark/shark/sequoia.c:1.11
--- src/sys/arch/shark/shark/sequoia.c:1.10 Wed Oct 17 19:57:10 2007
+++ src/sys/arch/shark/shark/sequoia.c Tue Jan 5 13:20:29 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sequoia.c,v 1.10 2007/10/17 19:57:10 garbled Exp $ */
+/* $NetBSD: sequoia.c,v 1.11 2010/01/05 13:20:29 mbalmer Exp $ */
/*
* Copyright 1997
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sequoia.c,v 1.10 2007/10/17 19:57:10 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sequoia.c,v 1.11 2010/01/05 13:20:29 mbalmer Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -130,7 +130,7 @@
static struct timeval ledLastActive; /* last time we get net activity */
static int ledColor; /* present color of led */
-static int ledBlockCount;; /* reference count of block calles */
+static int ledBlockCount; /* reference count of block calles */
int sequoia_index_cache = -1; /* set to silly value so that we dont cache on init */
static callout_t led_timo_ch;
Index: src/sys/arch/vax/vax/trap.c
diff -u src/sys/arch/vax/vax/trap.c:1.121 src/sys/arch/vax/vax/trap.c:1.122
--- src/sys/arch/vax/vax/trap.c:1.121 Thu Dec 10 14:13:53 2009
+++ src/sys/arch/vax/vax/trap.c Tue Jan 5 13:20:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.121 2009/12/10 14:13:53 matt Exp $ */
+/* $NetBSD: trap.c,v 1.122 2010/01/05 13:20:30 mbalmer Exp $ */
/*
* Copyright (c) 1994 Ludd, University of Lule}, Sweden.
@@ -33,7 +33,7 @@
/* All bugs are subject to removal without further notice */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.121 2009/12/10 14:13:53 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.122 2010/01/05 13:20:30 mbalmer Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
@@ -114,7 +114,7 @@
u_int sig = 0, type = frame->trap, code = 0;
u_int rv, addr;
bool trapsig = true;
- const bool usermode = USERMODE_P(frame);;
+ const bool usermode = USERMODE_P(frame);
struct lwp *l;
struct proc *p;
struct pcb *pcb;
Index: src/sys/arch/x86/x86/mpacpi.c
diff -u src/sys/arch/x86/x86/mpacpi.c:1.79 src/sys/arch/x86/x86/mpacpi.c:1.80
--- src/sys/arch/x86/x86/mpacpi.c:1.79 Wed Nov 4 14:39:17 2009
+++ src/sys/arch/x86/x86/mpacpi.c Tue Jan 5 13:20:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: mpacpi.c,v 1.79 2009/11/04 14:39:17 toshii Exp $ */
+/* $NetBSD: mpacpi.c,v 1.80 2010/01/05 13:20:30 mbalmer Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpacpi.c,v 1.79 2009/11/04 14:39:17 toshii Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpacpi.c,v 1.80 2010/01/05 13:20:30 mbalmer Exp $");
#include "acpica.h"
#include "opt_acpi.h"
@@ -336,7 +336,7 @@
break;
case ACPI_MADT_TYPE_LOCAL_APIC_OVERRIDE:
lop = (ACPI_MADT_LOCAL_APIC_OVERRIDE *)hdrp;
- mpacpi_lapic_base = lop->Address;;
+ mpacpi_lapic_base = lop->Address;
default:
break;
}
