Date: Tue, 02 Feb 2016 20:06:30 -0800 From: Devin Teske <dteske@FreeBSD.org> To: Benjamin Kaduk <bjkfbsd@gmail.com> Cc: "src-committers@freebsd.org" <src-committers@freebsd.org>, "svn-src-all@freebsd.org" <svn-src-all@freebsd.org>, "svn-src-head@freebsd.org" <svn-src-head@freebsd.org> Subject: Re: svn commit: r295169 - head/usr.sbin/sysrc Message-ID: <1454472390.31394.1.camel@FreeBSD.org> In-Reply-To: <CAJ5_RoB7E86xD10tLiSVPs4YYU3NTpKfiWz=ZcvG3Y1Gbzmewg@mail.gmail.com> References: <201602022158.u12LwHtr068296@repo.freebsd.org> <CAJ5_RoAu=4bpkobehiL0Ug6d0r_hpgdy3UTay628MkxxkEJB4w@mail.gmail.com> <1454457045.37056.69.camel@FreeBSD.org> <CAJ5_RoB7E86xD10tLiSVPs4YYU3NTpKfiWz=ZcvG3Y1Gbzmewg@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, 2016-02-02 at 21:40 -0600, Benjamin Kaduk wrote: > On Tue, Feb 2, 2016 at 5:50 PM, Devin Teske <dteske@freebsd.org> > wrote: > > On Tue, 2016-02-02 at 16:03 -0600, Benjamin Kaduk wrote: > > > On Tue, Feb 2, 2016 at 3:58 PM, Devin Teske <dteske@freebsd.org> > > > wrote: > > > > Author: dteske > > > > Date: Tue Feb 2 21:58:17 2016 > > > > New Revision: 295169 > > > > URL: https://svnweb.freebsd.org/changeset/base/295169 > > > > > > > > Log: > > > > Replace (Qo \ Qc) with (Qo (space) Qc) > > > > > > > > When using col(1) piped to vim(1) as pager for man(1), the > > > > former sequence > > > > of (Qo \ Qc) renders as "" without the space. Replace with > > > > (Qo (space) Qc) > > > > which renders properly in more (all?) pagers. > > > mdoc(7) also suggests using double-quotes (" ") to escape literal > > > spaces; did you try that? > > Did not try -- tried just now and it works. Will update with a > > commit. > > > > However... /me opens "man mdoc" > > (20 minutes later; confused as to where) > > > > I've read mdoc(7) several times and have never seen such a > > clarification. > > (which I might add; would be mighty useful if you can find it) > > > > > The shame is on me; I had opened the system mdoc(7) on OS X, which is > actually groff_mdoc(7). There is a subsection therein "Passing Space > Characters in an Argument" which has the text in question. I guess I > need to spend more time with the mdocml mdoc(7) to get used to what > it contains (and does not contain). > > Sorry for sending you down the wrong rabbit hole... Funny thing was, your suggestion absolutely worked. Learned something our mdoc(7) doesn't document but supports. -- Devin From owner-svn-src-all@freebsd.org Wed Feb 3 08:02:15 2016 Return-Path: <owner-svn-src-all@freebsd.org> Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C52D8A9A0C5 for <svn-src-all@mailman.ysv.freebsd.org>; Wed, 3 Feb 2016 08:02:15 +0000 (UTC) (envelope-from wma@semihalf.com) Received: from mail-ig0-x22b.google.com (mail-ig0-x22b.google.com [IPv6:2607:f8b0:4001:c05::22b]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9936B1BC2 for <svn-src-all@freebsd.org>; Wed, 3 Feb 2016 08:02:15 +0000 (UTC) (envelope-from wma@semihalf.com) Received: by mail-ig0-x22b.google.com with SMTP id hb3so5502357igb.0 for <svn-src-all@freebsd.org>; Wed, 03 Feb 2016 00:02:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type; bh=xJTorXB1e/azs4NIDgWR0IGDDJTlToRDjqwOiMMlck0=; b=BK7zGxw1Opo0J8utQ2Ski7VMlx43DvLfV1/R9A2hWxzDsuxV/QR+L5zcW5RIxd+Kgh NedI1pdf0CTJdMn76+oRyFb2r6xvN4k97/5vKETjD0Tj7Jr3HSzOg4m3q1Z/To65sf7b ch/XxFQdK/20CXPMQSt2QXsYiqzi5+QhHnO4gxcAAuyCUgXHE6KP/mSrsmTWYMtwuH2m IlI/mwPBhUGq6Ut3OEPtDLQtjvXsK8XgrDiXK6IFoKRydnqZiabCik+fH6cssODbLRrg LoFsqEwiLuFyLCpG+SN237AkXAer68CQVv9DejCIsTe5qXCX/vSiqlSbdQi0lAYXh3Mm YLRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc:content-type; bh=xJTorXB1e/azs4NIDgWR0IGDDJTlToRDjqwOiMMlck0=; b=Je5LUF7HNr2xtS+CG2zM98T3gln8lGa4jEKHboxAmYpYEa2vn7HaYfyqxm0eJjrYjp jdw8Lfxd69ApKUxQ69bDX+wy84M0g2vUbBGx8dZoYSXJrl3YlVpVJLgLJat42p2aGpU2 ZT3VtZGlnbier5ayCOiuOPePb1ZPFvwCpN0GnnAbn+mMbZM1cbwQ5+6gbepoeUQplX3a n19T/Wd5unnXlGKPx6yrm9+EYC2Bu7xe+uukEcqvHVBJutlhSaq2CTEAMwuRGKwE73pu rm9C/IB8CzWx048WzqkCiD5eGEsYT4AkZOwerHysKBRZWKblEL+qI7+OxTY95g8ZJPno oIMg== X-Gm-Message-State: AG10YOSEszuySSv2tvpTQFAaJkx2RoQ9fiaikAjtwl6onArDsFGCnZfAgtqrB0sW5MlZPxuLqXVPXd9OjPLUtA== X-Received: by 10.50.43.228 with SMTP id z4mr2113058igl.33.1454486534982; Wed, 03 Feb 2016 00:02:14 -0800 (PST) MIME-Version: 1.0 Received: by 10.107.154.19 with HTTP; Wed, 3 Feb 2016 00:01:55 -0800 (PST) In-Reply-To: <201602022117.u12LHP7M056632@repo.freebsd.org> References: <201602022117.u12LHP7M056632@repo.freebsd.org> From: Wojciech Macek <wma@semihalf.com> Date: Wed, 3 Feb 2016 09:01:55 +0100 Message-ID: <CANsEV8fPdqRUih+jduhBiMNsSjRbzhnh6wYhs8Lx_B0jE7qw3A@mail.gmail.com> Subject: Re: svn commit: r295168 - in head/sys/arm: arm include To: Svatopluk Kraus <skra@freebsd.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.20 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" <svn-src-all.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>, <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>; List-Post: <mailto:svn-src-all@freebsd.org> List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>, <mailto:svn-src-all-request@freebsd.org?subject=subscribe> X-List-Received-Date: Wed, 03 Feb 2016 08:02:16 -0000 Is it necessary to add acle-compat.h to the includes? If so, I suggest putting it under ifndef __aarch64__ , to fix the ARM64 build. Regards, Wojtek 2016-02-02 22:17 GMT+01:00 Svatopluk Kraus <skra@freebsd.org>: > Author: skra > Date: Tue Feb 2 21:17:25 2016 > New Revision: 295168 > URL: https://svnweb.freebsd.org/changeset/base/295168 > > Log: > Use pmap_preboot_map_attr() directly in arm_devmap_bootstrap() > instead of hiding behind pmap_map_chunk(). It's not longer needed > after old pmap-v6 code was removed. > > For compatibility with __ARM_ARCH < 6, define PTE_DEVICE in devmap.c > file. Certainly, it would be nice if VM_MEMATTR_DEVICE could be used > even for __ARM_ARCH < 6. > > Modified: > head/sys/arm/arm/devmap.c > head/sys/arm/include/pmap-v6.h > > Modified: head/sys/arm/arm/devmap.c > > ============================================================================== > --- head/sys/arm/arm/devmap.c Tue Feb 2 21:11:23 2016 (r295167) > +++ head/sys/arm/arm/devmap.c Tue Feb 2 21:17:25 2016 (r295168) > @@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$"); > #include <vm/vm.h> > #include <vm/vm_extern.h> > #include <vm/pmap.h> > +#include <machine/acle-compat.h> > #include <machine/armreg.h> > #include <machine/devmap.h> > #include <machine/vmparam.h> > @@ -52,6 +53,9 @@ static boolean_t devmap_bootstrap_done = > #define PTE_DEVICE VM_MEMATTR_DEVICE > #elif defined(__arm__) > #define MAX_VADDR ARM_VECTORS_HIGH > +#if __ARM_ARCH >= 6 > +#define PTE_DEVICE VM_MEMATTR_DEVICE > +#endif > #endif > > /* > @@ -204,8 +208,13 @@ arm_devmap_bootstrap(vm_offset_t l1pt, c > > for (pd = devmap_table; pd->pd_size != 0; ++pd) { > #if defined(__arm__) > +#if __ARM_ARCH >= 6 > + pmap_preboot_map_attr(pd->pd_pa, pd->pd_va, pd->pd_size, > + pd->pd_prot, pd->pd_cache); > +#else > pmap_map_chunk(l1pt, pd->pd_va, pd->pd_pa, pd->pd_size, > - pd->pd_prot,pd->pd_cache); > + pd->pd_prot, pd->pd_cache); > +#endif > #elif defined(__aarch64__) > pmap_kenter_device(pd->pd_va, pd->pd_size, pd->pd_pa); > #endif > > Modified: head/sys/arm/include/pmap-v6.h > > ============================================================================== > --- head/sys/arm/include/pmap-v6.h Tue Feb 2 21:11:23 2016 > (r295167) > +++ head/sys/arm/include/pmap-v6.h Tue Feb 2 21:17:25 2016 > (r295168) > @@ -218,12 +218,6 @@ vm_offset_t pmap_preboot_reserve_pages(u > vm_offset_t pmap_preboot_get_vpages(u_int ); > void pmap_preboot_map_attr(vm_paddr_t, vm_offset_t, vm_size_t, vm_prot_t, > vm_memattr_t); > -static __inline void > -pmap_map_chunk(vm_offset_t l1pt, vm_offset_t va, vm_offset_t pa, > - vm_size_t size, int prot, int cache) > -{ > - pmap_preboot_map_attr(pa, va, size, prot, cache); > -} > > #endif /* _KERNEL */ > > @@ -256,29 +250,6 @@ pmap_map_chunk(vm_offset_t l1pt, vm_offs > */ > void vector_page_setprot(int); > > -/* > - * sys/arm/arm/bus_space_generic.c (just comment) > - * sys/arm/arm/devmap.c > - * sys/arm/arm/pmap.c (just comment) > - * sys/arm/at91/at91_machdep.c > - * sys/arm/cavium/cns11xx/econa_machdep.c > - * sys/arm/freescale/imx/imx6_machdep.c (just comment) > - * sys/arm/mv/orion/db88f5xxx.c > - * sys/arm/mv/mv_localbus.c > - * sys/arm/mv/mv_machdep.c > - * sys/arm/mv/mv_pci.c > - * sys/arm/s3c2xx0/s3c24x0_machdep.c > - * sys/arm/versatile/versatile_machdep.c > - * sys/arm/xscale/ixp425/avila_machdep.c > - * sys/arm/xscale/i8134x/crb_machdep.c > - * sys/arm/xscale/i80321/ep80219_machdep.c > - * sys/arm/xscale/i80321/iq31244_machdep.c > - * sys/arm/xscale/pxa/pxa_machdep.c > - */ > -#define PTE_DEVICE PTE2_ATTR_DEVICE > - > - > - > #endif /* _KERNEL */ > // > ----------------------------------------------------------------------------- > > >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1454472390.31394.1.camel>