From ae5c1bda3c396be24a4ede9d7a5be162781ac673 Mon Sep 17 00:00:00 2001 From: obrien Date: Mon, 25 Aug 2003 09:48:48 +0000 Subject: Fix copyright comment & FBSDID style nits. Requested by: bde --- sys/amd64/amd64/bios.c | 1 - sys/amd64/amd64/mp_machdep.c | 3 +-- sys/amd64/amd64/mptable.c | 3 +-- sys/amd64/include/mptable.h | 3 +-- sys/dev/sio/sio_isa.c | 1 - sys/dev/sio/sio_pccard.c | 1 - sys/i386/i386/atomic.c | 1 - sys/i386/i386/bios.c | 1 - sys/i386/i386/db_disasm.c | 1 - sys/i386/i386/db_interface.c | 1 - sys/i386/i386/db_trace.c | 1 - sys/i386/i386/dump_machdep.c | 1 - sys/i386/i386/elan-mmcr.c | 2 +- sys/i386/i386/elf_machdep.c | 1 - sys/i386/i386/i386-gdbstub.c | 7 +++---- sys/i386/i386/i686_mem.c | 1 - sys/i386/i386/identcpu.c | 2 +- sys/i386/i386/initcpu.c | 3 +-- sys/i386/i386/k6_mem.c | 2 -- sys/i386/i386/legacy.c | 3 +-- sys/i386/i386/mp_clock.c | 14 +++++++------- sys/i386/i386/mp_machdep.c | 3 +-- sys/i386/i386/mpapic.c | 3 +-- sys/i386/i386/mptable.c | 3 +-- sys/i386/i386/nexus.c | 3 +-- sys/i386/i386/perfmon.c | 3 +-- sys/i386/i386/pmap.c | 8 ++++---- sys/i386/i386/sys_machdep.c | 1 - sys/i386/i386/tsc.c | 1 - sys/i386/i386/vm86.c | 1 - sys/i386/include/mptable.h | 3 +-- 31 files changed, 27 insertions(+), 55 deletions(-) diff --git a/sys/amd64/amd64/bios.c b/sys/amd64/amd64/bios.c index 4e22fae..69f6ded 100644 --- a/sys/amd64/amd64/bios.c +++ b/sys/amd64/amd64/bios.c @@ -23,7 +23,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * */ #include diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c index 142ad9c..3c65b3b 100644 --- a/sys/amd64/amd64/mp_machdep.c +++ b/sys/amd64/amd64/mp_machdep.c @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1996, by Steve Passe * All rights reserved. * @@ -21,7 +21,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * */ #include diff --git a/sys/amd64/amd64/mptable.c b/sys/amd64/amd64/mptable.c index 142ad9c..3c65b3b 100644 --- a/sys/amd64/amd64/mptable.c +++ b/sys/amd64/amd64/mptable.c @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1996, by Steve Passe * All rights reserved. * @@ -21,7 +21,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * */ #include diff --git a/sys/amd64/include/mptable.h b/sys/amd64/include/mptable.h index 142ad9c..3c65b3b 100644 --- a/sys/amd64/include/mptable.h +++ b/sys/amd64/include/mptable.h @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1996, by Steve Passe * All rights reserved. * @@ -21,7 +21,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * */ #include diff --git a/sys/dev/sio/sio_isa.c b/sys/dev/sio/sio_isa.c index d1231c4..99d794d 100644 --- a/sys/dev/sio/sio_isa.c +++ b/sys/dev/sio/sio_isa.c @@ -20,7 +20,6 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * */ #include diff --git a/sys/dev/sio/sio_pccard.c b/sys/dev/sio/sio_pccard.c index 644ca96..182c98c 100644 --- a/sys/dev/sio/sio_pccard.c +++ b/sys/dev/sio/sio_pccard.c @@ -20,7 +20,6 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * */ #include diff --git a/sys/i386/i386/atomic.c b/sys/i386/i386/atomic.c index 405351f..1b4ff7e 100644 --- a/sys/i386/i386/atomic.c +++ b/sys/i386/i386/atomic.c @@ -22,7 +22,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * */ #include diff --git a/sys/i386/i386/bios.c b/sys/i386/i386/bios.c index 4e22fae..69f6ded 100644 --- a/sys/i386/i386/bios.c +++ b/sys/i386/i386/bios.c @@ -23,7 +23,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * */ #include diff --git a/sys/i386/i386/db_disasm.c b/sys/i386/i386/db_disasm.c index e1b6aa8..e4c227d 100644 --- a/sys/i386/i386/db_disasm.c +++ b/sys/i386/i386/db_disasm.c @@ -22,7 +22,6 @@ * * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. - * */ #include diff --git a/sys/i386/i386/db_interface.c b/sys/i386/i386/db_interface.c index 3ba9cb5..f17f603 100644 --- a/sys/i386/i386/db_interface.c +++ b/sys/i386/i386/db_interface.c @@ -22,7 +22,6 @@ * * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. - * */ #include diff --git a/sys/i386/i386/db_trace.c b/sys/i386/i386/db_trace.c index 0fa5d09..4696bce 100644 --- a/sys/i386/i386/db_trace.c +++ b/sys/i386/i386/db_trace.c @@ -22,7 +22,6 @@ * * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. - * */ #include diff --git a/sys/i386/i386/dump_machdep.c b/sys/i386/i386/dump_machdep.c index d7fab87..83155b0 100644 --- a/sys/i386/i386/dump_machdep.c +++ b/sys/i386/i386/dump_machdep.c @@ -31,7 +31,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * */ #include diff --git a/sys/i386/i386/elan-mmcr.c b/sys/i386/i386/elan-mmcr.c index c91b6c7..b0501cf 100644 --- a/sys/i386/i386/elan-mmcr.c +++ b/sys/i386/i386/elan-mmcr.c @@ -1,4 +1,4 @@ -/* +/*- * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42): * wrote this file. As long as you retain this notice you diff --git a/sys/i386/i386/elf_machdep.c b/sys/i386/i386/elf_machdep.c index fe756b1..4d4b6d2 100644 --- a/sys/i386/i386/elf_machdep.c +++ b/sys/i386/i386/elf_machdep.c @@ -21,7 +21,6 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * */ #include diff --git a/sys/i386/i386/i386-gdbstub.c b/sys/i386/i386/i386-gdbstub.c index 3ad3f5b..330a46a 100644 --- a/sys/i386/i386/i386-gdbstub.c +++ b/sys/i386/i386/i386-gdbstub.c @@ -12,6 +12,9 @@ ****************************************************************************/ +#include +__FBSDID("$FreeBSD$"); + /**************************************************************************** * Header: remcom.c,v 1.34 91/03/09 12:29:49 glenne Exp $ * @@ -92,10 +95,6 @@ * ****************************************************************************/ - - -#include -__FBSDID("$FreeBSD$"); #include #include #include diff --git a/sys/i386/i386/i686_mem.c b/sys/i386/i386/i686_mem.c index ee43277..49a1dfe 100644 --- a/sys/i386/i386/i686_mem.c +++ b/sys/i386/i386/i686_mem.c @@ -22,7 +22,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * */ #include diff --git a/sys/i386/i386/identcpu.c b/sys/i386/i386/identcpu.c index ab9661a..577b214 100644 --- a/sys/i386/i386/identcpu.c +++ b/sys/i386/i386/identcpu.c @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1992 Terrence R. Lambert. * Copyright (c) 1982, 1987, 1990 The Regents of the University of California. * Copyright (c) 1997 KATO Takenori. diff --git a/sys/i386/i386/initcpu.c b/sys/i386/i386/initcpu.c index ca20272..7168003 100644 --- a/sys/i386/i386/initcpu.c +++ b/sys/i386/i386/initcpu.c @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) KATO Takenori, 1997, 1998. * * All rights reserved. Unpublished rights reserved under the copyright @@ -25,7 +25,6 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * */ #include diff --git a/sys/i386/i386/k6_mem.c b/sys/i386/i386/k6_mem.c index 2ab6134..ac7a55a 100644 --- a/sys/i386/i386/k6_mem.c +++ b/sys/i386/i386/k6_mem.c @@ -22,8 +22,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * */ #include diff --git a/sys/i386/i386/legacy.c b/sys/i386/i386/legacy.c index 7d72f4f..bc876e1 100644 --- a/sys/i386/i386/legacy.c +++ b/sys/i386/i386/legacy.c @@ -1,4 +1,4 @@ -/* +/*- * Copyright 1998 Massachusetts Institute of Technology * * Permission to use, copy, modify, and distribute this software and @@ -25,7 +25,6 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * */ #include diff --git a/sys/i386/i386/mp_clock.c b/sys/i386/i386/mp_clock.c index 38ec033..cd6478b 100644 --- a/sys/i386/i386/mp_clock.c +++ b/sys/i386/i386/mp_clock.c @@ -1,11 +1,16 @@ -/* +/*- * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42): * wrote this file. As long as you retain this notice you * can do whatever you want with this stuff. If we meet some day, and you think * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- - * + */ + +#include +__FBSDID("$FreeBSD$"); + +/*- * Just when we thought life were beautiful, reality pops its grim face over * the edge again: * @@ -28,13 +33,8 @@ * three monotonic samples and then use the middle one, otherwise we are * not protected against the fact that the bits can be wrong in two * directions. If we only cared about monosity two reads would be enough. - * - * */ -#include -__FBSDID("$FreeBSD$"); - /* #include "opt_bus.h" */ #include diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c index 142ad9c..3c65b3b 100644 --- a/sys/i386/i386/mp_machdep.c +++ b/sys/i386/i386/mp_machdep.c @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1996, by Steve Passe * All rights reserved. * @@ -21,7 +21,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * */ #include diff --git a/sys/i386/i386/mpapic.c b/sys/i386/i386/mpapic.c index beba318..398f5d3 100644 --- a/sys/i386/i386/mpapic.c +++ b/sys/i386/i386/mpapic.c @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1996, by Steve Passe * All rights reserved. * @@ -21,7 +21,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * */ #include diff --git a/sys/i386/i386/mptable.c b/sys/i386/i386/mptable.c index 142ad9c..3c65b3b 100644 --- a/sys/i386/i386/mptable.c +++ b/sys/i386/i386/mptable.c @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1996, by Steve Passe * All rights reserved. * @@ -21,7 +21,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * */ #include diff --git a/sys/i386/i386/nexus.c b/sys/i386/i386/nexus.c index b008a15..96a2a17 100644 --- a/sys/i386/i386/nexus.c +++ b/sys/i386/i386/nexus.c @@ -1,4 +1,4 @@ -/* +/*- * Copyright 1998 Massachusetts Institute of Technology * * Permission to use, copy, modify, and distribute this software and @@ -25,7 +25,6 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * */ #include diff --git a/sys/i386/i386/perfmon.c b/sys/i386/i386/perfmon.c index 70964f0..a5cd307 100644 --- a/sys/i386/i386/perfmon.c +++ b/sys/i386/i386/perfmon.c @@ -1,4 +1,4 @@ -/* +/*- * Copyright 1996 Massachusetts Institute of Technology * * Permission to use, copy, modify, and distribute this software and @@ -25,7 +25,6 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * */ #include diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c index 6c1d01f..1f13890 100644 --- a/sys/i386/i386/pmap.c +++ b/sys/i386/i386/pmap.c @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1991 Regents of the University of California. * All rights reserved. * Copyright (c) 1994 John S. Dyson @@ -40,9 +40,6 @@ * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 */ - -#include -__FBSDID("$FreeBSD$"); /*- * Copyright (c) 2003 Networks Associates Technology, Inc. * All rights reserved. @@ -75,6 +72,9 @@ __FBSDID("$FreeBSD$"); * SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD$"); + /* * Manages physical address maps. * diff --git a/sys/i386/i386/sys_machdep.c b/sys/i386/i386/sys_machdep.c index f595b5e..f809b88 100644 --- a/sys/i386/i386/sys_machdep.c +++ b/sys/i386/i386/sys_machdep.c @@ -31,7 +31,6 @@ * SUCH DAMAGE. * * from: @(#)sys_machdep.c 5.5 (Berkeley) 1/19/91 - * */ #include diff --git a/sys/i386/i386/tsc.c b/sys/i386/i386/tsc.c index 7b46dd4..8fc50b3 100644 --- a/sys/i386/i386/tsc.c +++ b/sys/i386/i386/tsc.c @@ -22,7 +22,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * */ #include diff --git a/sys/i386/i386/vm86.c b/sys/i386/i386/vm86.c index d5d4134..1d002f1 100644 --- a/sys/i386/i386/vm86.c +++ b/sys/i386/i386/vm86.c @@ -22,7 +22,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * */ #include diff --git a/sys/i386/include/mptable.h b/sys/i386/include/mptable.h index 142ad9c..3c65b3b 100644 --- a/sys/i386/include/mptable.h +++ b/sys/i386/include/mptable.h @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1996, by Steve Passe * All rights reserved. * @@ -21,7 +21,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * */ #include -- cgit v1.1