Date: Mon, 24 Feb 2020 06:56:38 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r358269 - in projects/clang1000-import: share/misc sys/vm usr.sbin/config Message-ID: <202002240656.01O6ucoW074078@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim Date: Mon Feb 24 06:56:38 2020 New Revision: 358269 URL: https://svnweb.freebsd.org/changeset/base/358269 Log: Merge ^/head r358263 through r358268. Modified: projects/clang1000-import/share/misc/bsd-family-tree projects/clang1000-import/sys/vm/swap_pager.c projects/clang1000-import/usr.sbin/config/config.5 projects/clang1000-import/usr.sbin/config/config.y projects/clang1000-import/usr.sbin/config/configvers.h Directory Properties: projects/clang1000-import/ (props changed) Modified: projects/clang1000-import/share/misc/bsd-family-tree ============================================================================== --- projects/clang1000-import/share/misc/bsd-family-tree Mon Feb 24 04:01:09 2020 (r358268) +++ projects/clang1000-import/share/misc/bsd-family-tree Mon Feb 24 06:56:38 2020 (r358269) @@ -799,7 +799,7 @@ OpenBSD 6.6 2019-10-17 [OBD] macOS 10.15 2019-10-07 [APL] macOS 10.15.1 2019-10-29 [APL] (security/critical release) FreeBSD 12.1 2019-11-04 [FBD] -NetBSD 9.0 2020-02-15 [NBD] +NetBSD 9.0 2020-02-14 [NBD] Bibliography ------------------------ Modified: projects/clang1000-import/sys/vm/swap_pager.c ============================================================================== --- projects/clang1000-import/sys/vm/swap_pager.c Mon Feb 24 04:01:09 2020 (r358268) +++ projects/clang1000-import/sys/vm/swap_pager.c Mon Feb 24 06:56:38 2020 (r358269) @@ -427,7 +427,7 @@ static int swapoff_one(struct swdevt *sp, struct ucred * Swap bitmap functions */ static void swp_pager_freeswapspace(daddr_t blk, daddr_t npages); -static daddr_t swp_pager_getswapspace(int *npages, int limit); +static daddr_t swp_pager_getswapspace(int *npages); /* * Metadata functions @@ -741,10 +741,9 @@ swap_pager_dealloc(vm_object_t object) /* * SWP_PAGER_GETSWAPSPACE() - allocate raw swap space * - * Allocate swap for up to the requested number of pages, and at - * least a minimum number of pages. The starting swap block number - * (a page index) is returned or SWAPBLK_NONE if the allocation - * failed. + * Allocate swap for up to the requested number of pages. The + * starting swap block number (a page index) is returned or + * SWAPBLK_NONE if the allocation failed. * * Also has the side effect of advising that somebody made a mistake * when they configured swap and didn't configure enough. @@ -754,12 +753,14 @@ swap_pager_dealloc(vm_object_t object) * We allocate in round-robin fashion from the configured devices. */ static daddr_t -swp_pager_getswapspace(int *io_npages, int limit) +swp_pager_getswapspace(int *io_npages) { daddr_t blk; struct swdevt *sp; int mpages, npages; + KASSERT(*io_npages >= 1, + ("%s: npages not positive", __func__)); blk = SWAPBLK_NONE; mpages = *io_npages; npages = imin(BLIST_MAX_ALLOC, mpages); @@ -774,7 +775,7 @@ swp_pager_getswapspace(int *io_npages, int limit) break; sp = TAILQ_NEXT(sp, sw_list); if (swdevhd == sp) { - if (npages <= limit) + if (npages == 1) break; mpages = npages - 1; npages >>= 1; @@ -937,7 +938,7 @@ swap_pager_reserve(vm_object_t object, vm_pindex_t sta VM_OBJECT_WLOCK(object); for (i = 0; i < size; i += n) { n = size - i; - blk = swp_pager_getswapspace(&n, 1); + blk = swp_pager_getswapspace(&n); if (blk == SWAPBLK_NONE) { swp_pager_meta_free(object, start, i); VM_OBJECT_WUNLOCK(object); @@ -1464,7 +1465,7 @@ swap_pager_putpages(vm_object_t object, vm_page_t *ma, /* Get a block of swap of size up to size n. */ VM_OBJECT_WLOCK(object); - blk = swp_pager_getswapspace(&n, 1); + blk = swp_pager_getswapspace(&n); if (blk == SWAPBLK_NONE) { VM_OBJECT_WUNLOCK(object); mtx_lock(&swbuf_mtx); Modified: projects/clang1000-import/usr.sbin/config/config.5 ============================================================================== --- projects/clang1000-import/usr.sbin/config/config.5 Mon Feb 24 04:01:09 2020 (r358268) +++ projects/clang1000-import/usr.sbin/config/config.5 Mon Feb 24 06:56:38 2020 (r358269) @@ -283,7 +283,8 @@ corresponds to MACHINE_ARCH. .Pp A kernel configuration file may have only one .Ic machine -directive. +directive, unless the second one matches the +machine argument in the first one exactly. .\" -------- MAKEOPTION -------- .Pp .It Ic makeoption Ar options Modified: projects/clang1000-import/usr.sbin/config/config.y ============================================================================== --- projects/clang1000-import/usr.sbin/config/config.y Mon Feb 24 04:01:09 2020 (r358268) +++ projects/clang1000-import/usr.sbin/config/config.y Mon Feb 24 06:56:38 2020 (r358269) @@ -155,8 +155,11 @@ Config_spec: machinearch = $2; } | ARCH Save_id Save_id { - if (machinename != NULL && - !(eq($2, machinename) && eq($3, machinearch))) + /* + * Allow the machinearch to change with a second machine directive, + * but still enforce no changes to the machinename. + */ + if (machinename != NULL && !eq($2, machinename)) errx(1, "%s:%d: only one machine directive is allowed", yyfile, yyline); machinename = $2; Modified: projects/clang1000-import/usr.sbin/config/configvers.h ============================================================================== --- projects/clang1000-import/usr.sbin/config/configvers.h Mon Feb 24 04:01:09 2020 (r358268) +++ projects/clang1000-import/usr.sbin/config/configvers.h Mon Feb 24 06:56:38 2020 (r358269) @@ -49,7 +49,7 @@ * * $FreeBSD$ */ -#define CONFIGVERS 600016 +#define CONFIGVERS 600017 #define MAJOR_VERS(x) ((x) / 100000) /* Last config(8) version to require envmode/hintmode */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002240656.01O6ucoW074078>