Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/x86/x86 KNF. No functional change.



details:   https://anonhg.NetBSD.org/src/rev/b03ad4573188
branches:  trunk
changeset: 1024005:b03ad4573188
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Thu Oct 07 12:52:27 2021 +0000

description:
KNF. No functional change.

diffstat:

 sys/arch/x86/x86/bus_dma.c        |   12 +-
 sys/arch/x86/x86/bus_space.c      |    6 +-
 sys/arch/x86/x86/consinit.c       |    6 +-
 sys/arch/x86/x86/coretemp.c       |    6 +-
 sys/arch/x86/x86/cpu.c            |    6 +-
 sys/arch/x86/x86/cpu_rng.c        |    4 +-
 sys/arch/x86/x86/db_memrw.c       |    6 +-
 sys/arch/x86/x86/efi.c            |   20 ++--
 sys/arch/x86/x86/errata.c         |   10 +-
 sys/arch/x86/x86/est.c            |   10 +-
 sys/arch/x86/x86/identcpu.c       |   10 +-
 sys/arch/x86/x86/intel_busclock.c |    6 +-
 sys/arch/x86/x86/intr.c           |   15 ++--
 sys/arch/x86/x86/ioapic.c         |   10 +-
 sys/arch/x86/x86/lapic.c          |   10 +-
 sys/arch/x86/x86/linux_trap.c     |   52 +++++++-------
 sys/arch/x86/x86/mp.c             |    6 +-
 sys/arch/x86/x86/mpacpi.c         |   18 ++--
 sys/arch/x86/x86/mpbios.c         |   44 ++++++------
 sys/arch/x86/x86/mtrr_i686.c      |   12 +-
 sys/arch/x86/x86/multiboot2.c     |  130 ++++++++++++++++++-------------------
 sys/arch/x86/x86/pmap.c           |   34 ++++----
 sys/arch/x86/x86/powernow.c       |   10 +-
 sys/arch/x86/x86/procfs_machdep.c |    6 +-
 sys/arch/x86/x86/spectre.c        |    6 +-
 sys/arch/x86/x86/svs.c            |    8 +-
 sys/arch/x86/x86/sys_machdep.c    |   31 ++++----
 sys/arch/x86/x86/syscall.c        |    6 +-
 sys/arch/x86/x86/viac7temp.c      |    8 +-
 sys/arch/x86/x86/x86_autoconf.c   |   20 ++--
 sys/arch/x86/x86/x86_ipmi.c       |   24 +++---
 sys/arch/x86/x86/x86_machdep.c    |   32 ++++----
 sys/arch/x86/x86/x86_tlb.c        |   18 ++--
 33 files changed, 301 insertions(+), 301 deletions(-)

diffs (truncated from 1963 to 300 lines):

diff -r b49da77c0aea -r b03ad4573188 sys/arch/x86/x86/bus_dma.c
--- a/sys/arch/x86/x86/bus_dma.c        Thu Oct 07 09:58:27 2021 +0000
+++ b/sys/arch/x86/x86/bus_dma.c        Thu Oct 07 12:52:27 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bus_dma.c,v 1.82 2020/03/14 18:08:38 ad Exp $  */
+/*     $NetBSD: bus_dma.c,v 1.83 2021/10/07 12:52:27 msaitoh Exp $     */
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2007, 2020 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.82 2020/03/14 18:08:38 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.83 2021/10/07 12:52:27 msaitoh Exp $");
 
 /*
  * The following is included because _bus_dma_uiomove is derived from
@@ -212,8 +212,8 @@
         * Allocate pages from the VM system.
         * We accept boundaries < size, splitting in multiple segments
         * if needed. uvm_pglistalloc does not, so compute an appropriate
-         * boundary: next power of 2 >= size
-         */
+        * boundary: next power of 2 >= size
+        */
 
        if (boundary == 0)
                uboundary = 0;
@@ -1172,8 +1172,8 @@
        eva = sva + size;
 
        /*
-         * mark pages cacheable again.
-         */
+        * mark pages cacheable again.
+        */
        for (va = sva; va < eva; va += PAGE_SIZE) {
                pte = kvtopte(va);
                opte = *pte;
diff -r b49da77c0aea -r b03ad4573188 sys/arch/x86/x86/bus_space.c
--- a/sys/arch/x86/x86/bus_space.c      Thu Oct 07 09:58:27 2021 +0000
+++ b/sys/arch/x86/x86/bus_space.c      Thu Oct 07 12:52:27 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bus_space.c,v 1.45 2020/04/25 15:26:18 bouyer Exp $    */
+/*     $NetBSD: bus_space.c,v 1.46 2021/10/07 12:52:27 msaitoh Exp $   */
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.45 2020/04/25 15:26:18 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.46 2021/10/07 12:52:27 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -57,7 +57,7 @@
  * could lead to performance improvements, and help catch problems
  * with drivers that would creep up on other architectures.
  */
-#ifdef BUS_SPACE_DEBUG 
+#ifdef BUS_SPACE_DEBUG
 #define        BUS_SPACE_ALIGNED_ADDRESS(p, t)                         \
        ((((u_long)(p)) & (sizeof(t)-1)) == 0)
 
diff -r b49da77c0aea -r b03ad4573188 sys/arch/x86/x86/consinit.c
--- a/sys/arch/x86/x86/consinit.c       Thu Oct 07 09:58:27 2021 +0000
+++ b/sys/arch/x86/x86/consinit.c       Thu Oct 07 12:52:27 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: consinit.c,v 1.33 2020/05/02 16:44:36 bouyer Exp $     */
+/*     $NetBSD: consinit.c,v 1.34 2021/10/07 12:52:27 msaitoh Exp $    */
 
 /*
  * Copyright (c) 1998
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.33 2020/05/02 16:44:36 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.34 2021/10/07 12:52:27 msaitoh Exp $");
 
 #include "opt_kgdb.h"
 #include "opt_puc.h"
@@ -277,7 +277,7 @@
 kgdb_port_init(void)
 {
 #if (NCOM > 0)
-       if(!strcmp(kgdb_devname, "com")) {
+       if (!strcmp(kgdb_devname, "com")) {
                com_kgdb_attach(x86_bus_space_io, comkgdbaddr, comkgdbrate,
                    COM_FREQ, COM_TYPE_NORMAL, comkgdbmode);
        }
diff -r b49da77c0aea -r b03ad4573188 sys/arch/x86/x86/coretemp.c
--- a/sys/arch/x86/x86/coretemp.c       Thu Oct 07 09:58:27 2021 +0000
+++ b/sys/arch/x86/x86/coretemp.c       Thu Oct 07 12:52:27 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: coretemp.c,v 1.37 2020/03/27 09:47:03 msaitoh Exp $ */
+/* $NetBSD: coretemp.c,v 1.38 2021/10/07 12:52:27 msaitoh Exp $ */
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: coretemp.c,v 1.37 2020/03/27 09:47:03 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: coretemp.c,v 1.38 2021/10/07 12:52:27 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -334,7 +334,7 @@
 static void
 coretemp_refresh_xcall(void *arg0, void *arg1)
 {
-        struct coretemp_softc *sc = arg0;
+       struct coretemp_softc *sc = arg0;
        envsys_data_t *edata = arg1;
        uint64_t msr;
 
diff -r b49da77c0aea -r b03ad4573188 sys/arch/x86/x86/cpu.c
--- a/sys/arch/x86/x86/cpu.c    Thu Oct 07 09:58:27 2021 +0000
+++ b/sys/arch/x86/x86/cpu.c    Thu Oct 07 12:52:27 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.c,v 1.201 2021/08/07 16:19:08 thorpej Exp $        */
+/*     $NetBSD: cpu.c,v 1.202 2021/10/07 12:52:27 msaitoh Exp $        */
 
 /*
  * Copyright (c) 2000-2020 NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.201 2021/08/07 16:19:08 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.202 2021/10/07 12:52:27 msaitoh Exp $");
 
 #include "opt_ddb.h"
 #include "opt_mpbios.h"                /* for MPDEBUG */
@@ -1341,7 +1341,7 @@
 #endif
                if (freq == 0) {
                        /*
-                        * Work out the approximate overhead involved below. 
+                        * Work out the approximate overhead involved below.
                         * Discard the result of the first go around the
                         * loop.
                         */
diff -r b49da77c0aea -r b03ad4573188 sys/arch/x86/x86/cpu_rng.c
--- a/sys/arch/x86/x86/cpu_rng.c        Thu Oct 07 09:58:27 2021 +0000
+++ b/sys/arch/x86/x86/cpu_rng.c        Thu Oct 07 12:52:27 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_rng.c,v 1.19 2020/07/30 17:26:23 riastradh Exp $ */
+/* $NetBSD: cpu_rng.c,v 1.20 2021/10/07 12:52:27 msaitoh Exp $ */
 
 /*-
  * Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -154,7 +154,7 @@
        uint32_t lo, hi;
 
        __asm __volatile("rdseed %0; setc %1" : "=r"(lo), "=qm"(rndsts));
-        if (rndsts != 1)
+       if (rndsts != 1)
                return 0;
        __asm __volatile("rdseed %0; setc %1" : "=r"(hi), "=qm"(rndsts));
        if (rndsts != 1)
diff -r b49da77c0aea -r b03ad4573188 sys/arch/x86/x86/db_memrw.c
--- a/sys/arch/x86/x86/db_memrw.c       Thu Oct 07 09:58:27 2021 +0000
+++ b/sys/arch/x86/x86/db_memrw.c       Thu Oct 07 12:52:27 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: db_memrw.c,v 1.11 2019/04/21 06:37:21 maxv Exp $       */
+/*     $NetBSD: db_memrw.c,v 1.12 2021/10/07 12:52:27 msaitoh Exp $    */
 
 /*-
  * Copyright (c) 1996, 2000 The NetBSD Foundation, Inc.
@@ -48,12 +48,12 @@
  * Jason R. Thorpe <thorpej%zembu.com@localhost>.
  *
  * Basic copy to amd64 by fvdl.
- * 
+ *
  * i386 and amd64 merge by jym.
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_memrw.c,v 1.11 2019/04/21 06:37:21 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_memrw.c,v 1.12 2021/10/07 12:52:27 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
diff -r b49da77c0aea -r b03ad4573188 sys/arch/x86/x86/efi.c
--- a/sys/arch/x86/x86/efi.c    Thu Oct 07 09:58:27 2021 +0000
+++ b/sys/arch/x86/x86/efi.c    Thu Oct 07 12:52:27 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: efi.c,v 1.21 2019/12/10 02:06:07 manu Exp $    */
+/*     $NetBSD: efi.c,v 1.22 2021/10/07 12:52:27 msaitoh Exp $ */
 
 /*-
  * Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: efi.c,v 1.21 2019/12/10 02:06:07 manu Exp $");
+__KERNEL_RCSID(0, "$NetBSD: efi.c,v 1.22 2021/10/07 12:52:27 msaitoh Exp $");
 
 #include <sys/kmem.h>
 #include <sys/param.h>
@@ -51,12 +51,12 @@
 const struct uuid EFI_UUID_SMBIOS = EFI_TABLE_SMBIOS;
 const struct uuid EFI_UUID_SMBIOS3 = EFI_TABLE_SMBIOS3;
 
-static vaddr_t         efi_getva(paddr_t);
-static void    efi_relva(paddr_t, vaddr_t);
+static vaddr_t efi_getva(paddr_t);
+static void    efi_relva(paddr_t, vaddr_t);
 struct efi_cfgtbl *efi_getcfgtblhead(void);
-void           efi_aprintcfgtbl(void);
-void           efi_aprintuuid(const struct uuid *);
-bool           efi_uuideq(const struct uuid *, const struct uuid *);
+void           efi_aprintcfgtbl(void);
+void           efi_aprintuuid(const struct uuid *);
+bool           efi_uuideq(const struct uuid *, const struct uuid *);
 
 static bool efi_is32x64 = false;
 static paddr_t efi_systbl_pa;
@@ -77,8 +77,8 @@
        vaddr_t va;
        int rv;
 
-       rv = _x86_memio_map(x86_bus_space_mem, pa,     
-           PAGE_SIZE, 0, (bus_space_handle_t *)&va);   
+       rv = _x86_memio_map(x86_bus_space_mem, pa,
+           PAGE_SIZE, 0, (bus_space_handle_t *)&va);
        if (rv != 0) {
                aprint_debug("efi: unable to allocate va\n");
                return 0;
@@ -405,7 +405,7 @@
                return;
        }
        bootmethod_efi = true;
-#if NPCI > 0   
+#if NPCI > 0
        pci_mapreg_map_enable_decode = true; /* PR port-amd64/53286 */
 #endif
 }
diff -r b49da77c0aea -r b03ad4573188 sys/arch/x86/x86/errata.c
--- a/sys/arch/x86/x86/errata.c Thu Oct 07 09:58:27 2021 +0000
+++ b/sys/arch/x86/x86/errata.c Thu Oct 07 12:52:27 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: errata.c,v 1.26 2019/05/18 07:49:31 maxv Exp $ */
+/*     $NetBSD: errata.c,v 1.27 2021/10/07 12:52:27 msaitoh Exp $      */
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: errata.c,v 1.26 2019/05/18 07:49:31 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: errata.c,v 1.27 2021/10/07 12:52:27 msaitoh Exp $");
 
 #include <sys/types.h>
 #include <sys/systm.h>
@@ -127,7 +127,7 @@
 static const uint8_t x86_errata_set8[] = {
        BH_E4, CH_CG, CH_CG, CH_D0, CH_D0, DH_CG, DH_CG, DH_CG,
        DH_D0, DH_D0, DH_E3, DH_E3, DH_E6, DH_E6, JH_E1, JH_E6,
-       JH_E6, SH_B0, SH_B3, SH_C0, SH_C0, SH_CG, SH_CG, SH_CG, 
+       JH_E6, SH_B0, SH_B3, SH_C0, SH_C0, SH_CG, SH_CG, SH_CG,
        SH_D0, SH_D0, SH_D0, SH_E4, SH_E4, SH_E5, OINK
 };
 
@@ -361,7 +361,7 @@
        },
 };
 
-static bool 
+static bool
 x86_errata_testmsr(struct cpu_info *ci, errata_t *e)
 {
        uint64_t val;
@@ -376,7 +376,7 @@
        return TRUE;
 }
 
-static bool 
+static bool
 x86_errata_setmsr(struct cpu_info *ci, errata_t *e)
 {
        uint64_t val;
diff -r b49da77c0aea -r b03ad4573188 sys/arch/x86/x86/est.c
--- a/sys/arch/x86/x86/est.c    Thu Oct 07 09:58:27 2021 +0000
+++ b/sys/arch/x86/x86/est.c    Thu Oct 07 12:52:27 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: est.c,v 1.32 2020/10/25 16:39:00 nia Exp $     */
+/*     $NetBSD: est.c,v 1.33 2021/10/07 12:52:27 msaitoh Exp $ */
 /*
  * Copyright (c) 2003 Michael Eriksson.
  * All rights reserved.



Home | Main Index | Thread Index | Old Index