Module Name: src Committed By: maxv Date: Tue Aug 15 09:25:00 UTC 2017
Modified Files: src/sys/arch/amd64/amd64: rbus_machdep.c src/sys/arch/i386/i386: rbus_machdep.c Log Message: Reduce the diff between amd64 and i386, and style. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/amd64/amd64/rbus_machdep.c cvs rdiff -u -r1.26 -r1.27 src/sys/arch/i386/i386/rbus_machdep.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/amd64/amd64/rbus_machdep.c diff -u src/sys/arch/amd64/amd64/rbus_machdep.c:1.6 src/sys/arch/amd64/amd64/rbus_machdep.c:1.7 --- src/sys/arch/amd64/amd64/rbus_machdep.c:1.6 Sun Jun 29 23:21:28 2014 +++ src/sys/arch/amd64/amd64/rbus_machdep.c Tue Aug 15 09:25:00 2017 @@ -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 @@ rbus_pccbb_parent_io(struct pci_attach_a 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; } Index: src/sys/arch/i386/i386/rbus_machdep.c diff -u src/sys/arch/i386/i386/rbus_machdep.c:1.26 src/sys/arch/i386/i386/rbus_machdep.c:1.27 --- src/sys/arch/i386/i386/rbus_machdep.c:1.26 Fri Jul 1 18:14:15 2011 +++ src/sys/arch/i386/i386/rbus_machdep.c Tue Aug 15 09:25:00 2017 @@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: rbus_machdep #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 @@ rbus_min_start_hint(psize_t ram) 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 @@ rbus_min_start_hint(psize_t ram) } aprint_debug("rbus: rbus_min_start set to %#0" PRIxPADDR "\n", - rbus_min_start); + rbus_min_start); #endif } @@ -151,11 +149,11 @@ rbus_pccbb_parent_mem(struct pci_attach_ * 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 @@ rbus_pccbb_parent_io(struct pci_attach_a 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; }