[src/trunk]: src/sys/arch Reduce the diff between amd64 and i386, and style.

[maxv <maxv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/66e175e124c4
branches:  trunk
changeset: 355805:66e175e124c4
user:      maxv <maxv%NetBSD.org@localhost>
date:      Tue Aug 15 09:25:00 2017 +0000

description:
Reduce the diff between amd64 and i386, and style.

diffstat:

 sys/arch/amd64/amd64/rbus_machdep.c |   6 +++---
 sys/arch/i386/i386/rbus_machdep.c   |  16 +++++++---------
 2 files changed, 10 insertions(+), 12 deletions(-)

diffs (95 lines):

diff -r a9d03547c1d5 -r 66e175e124c4 sys/arch/amd64/amd64/rbus_machdep.c
--- a/sys/arch/amd64/amd64/rbus_machdep.c       Tue Aug 15 09:21:48 2017 +0000
+++ b/sys/arch/amd64/amd64/rbus_machdep.c       Tue Aug 15 09:25:00 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rbus_machdep.c,v 1.6 2014/06/29 23:21:28 jakllsch Exp $        */
+/*     $NetBSD: rbus_machdep.c,v 1.7 2017/08/15 09:25:00 maxv Exp $    */
 
 /*
  * Copyright (c) 1999
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rbus_machdep.c,v 1.6 2014/06/29 23:21:28 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rbus_machdep.c,v 1.7 2017/08/15 09:25:00 maxv Exp $");
 
 #include "opt_pcifixup.h"
 
@@ -123,7 +123,7 @@
 
        ret = rbus_new_root_share(pa->pa_iot, ex, start, size, 0);
        if (ret == NULL)
-         panic("failed to alloc I/O space");
+               panic("failed to alloc I/O space");
 
        return ret;
 }
diff -r a9d03547c1d5 -r 66e175e124c4 sys/arch/i386/i386/rbus_machdep.c
--- a/sys/arch/i386/i386/rbus_machdep.c Tue Aug 15 09:21:48 2017 +0000
+++ b/sys/arch/i386/i386/rbus_machdep.c Tue Aug 15 09:25:00 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rbus_machdep.c,v 1.26 2011/07/01 18:14:15 dyoung Exp $ */
+/*     $NetBSD: rbus_machdep.c,v 1.27 2017/08/15 09:25:00 maxv Exp $   */
 
 /*
  * Copyright (c) 1999
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rbus_machdep.c,v 1.26 2011/07/01 18:14:15 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rbus_machdep.c,v 1.27 2017/08/15 09:25:00 maxv Exp $");
 
 #include "opt_pcibios.h"
 #include "opt_pcifixup.h"
@@ -35,8 +35,6 @@
 #include <sys/systm.h>
 #include <sys/extent.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <sys/sysctl.h>
 
 #include <sys/bus.h>
@@ -88,7 +86,7 @@
        aprint_debug("rbus: rbus_min_start from config at %#0" PRIxPADDR "\n",
            rbus_min_start);
 #else
-        if (ram <= 192*1024*1024UL) {
+       if (ram <= 192*1024*1024UL) {
                /*
                 * <= 192 MB, so try 0.5 GB.  This will work on
                 * Thinkpad 600E (2645-4AU), which fails at 1GB, and
@@ -114,7 +112,7 @@
        }
 
        aprint_debug("rbus: rbus_min_start set to %#0" PRIxPADDR "\n",
-          rbus_min_start);
+           rbus_min_start);
 #endif
 }
 
@@ -151,11 +149,11 @@
         * which is not recognised by the kernel as already reserved.
         */
 
-       if (start < rbus_min_start) 
+       if (start < rbus_min_start)
                start = rbus_min_start;
 
        size = ex->ex_end - start;
-  
+
        return rbus_new_root_share(pa->pa_memt, ex, start, size, 0);
 }
 
@@ -182,7 +180,7 @@
 
        ret = rbus_new_root_share(pa->pa_iot, ex, start, size, 0);
        if (ret == NULL)
-         panic("failed to alloc I/O space");
+               panic("failed to alloc I/O space");
 
        return ret;
 }