From owner-svn-src-head@freebsd.org Thu Dec 17 20:32:30 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A17FD4C3523 for ; Thu, 17 Dec 2020 20:32:30 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CxkFV41mMz4krt for ; Thu, 17 Dec 2020 20:32:30 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: by mail-wr1-f52.google.com with SMTP id d26so14679283wrb.12 for ; Thu, 17 Dec 2020 12:32:30 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=5UgfwXSTz7L5dfQEFuSU7T+cD6OLcoVadiJaoTXRLZo=; b=hFRshQFzfU2nfW/6t78z2wLy/2lCvT/ebiG/XIPE07GffKvt6vJfvialpiXH6DyyOT dXPhpOYl7Fjrr2NszBCbv+NxaYMBqgPVVHPvxk4fDFss1ZjYvhHVHA2GCZ+uXLLtAv1B +s/AtBd9CVE6Wqzb5ZzOTg7zxDs0m1DCc2Di8Hw2gdTV5CNSW4Elp4cI0VEY5D6gK/05 V2YFY2c7/7LjZ70u7Ku2KXwSjsaBOVJ1Nt1NNaVYp8XEwXkwp8Fgjkor16VV1tdsI1ME xMx0g0HIGrw6idL4wUBS1w7yr+5vR1UzpUeFcDIed9uAin5jl2UOJ2SHK8iPh0LfRbqb L7jA== X-Gm-Message-State: AOAM533H/kv/tjZ7p3q2xkg6J3nVYe955McyLpOzeYZO+PGMtWya6zEI w42baraPg5puWzOOMztEnXLA6w== X-Google-Smtp-Source: ABdhPJyoiqxDtCjnUU40aeSVtQrGinZ3z/WenSz2gx8llVIz444VqAALC9sIgAq8ThFJ0ezCR7DmTQ== X-Received: by 2002:adf:e688:: with SMTP id r8mr645171wrm.20.1608237148985; Thu, 17 Dec 2020 12:32:28 -0800 (PST) Received: from [192.168.149.251] (trinity-students-nat.trin.cam.ac.uk. [131.111.193.104]) by smtp.gmail.com with ESMTPSA id m4sm8928523wmi.41.2020.12.17.12.32.28 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Dec 2020 12:32:28 -0800 (PST) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.120.23.2.4\)) Subject: Re: svn commit: r368738 - head/sys/compat/linuxkpi/common/include/linux From: Jessica Clarke In-Reply-To: <202012172028.0BHKSsf4099202@repo.freebsd.org> Date: Thu, 17 Dec 2020 20:32:26 +0000 Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <085D2B00-C0DC-4D4F-80AC-C8754302ABB3@freebsd.org> References: <202012172028.0BHKSsf4099202@repo.freebsd.org> To: John Baldwin X-Mailer: Apple Mail (2.3608.120.23.2.4) X-Rspamd-Queue-Id: 4CxkFV41mMz4krt X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Dec 2020 20:32:30 -0000 On 17 Dec 2020, at 20:28, John Baldwin wrote: >=20 > Author: jhb > Date: Thu Dec 17 20:28:53 2020 > New Revision: 368738 > URL: https://svnweb.freebsd.org/changeset/base/368738 >=20 > Log: > Cleanups to *ERR* compat shims. >=20 > - Use [u]intptr_t casts to convert pointers to integers. >=20 > - Change IS_ERR* to return bool instead of long. >=20 > Reviewed by: manu > Obtained from: CheriBSD > Sponsored by: DARPA > Differential Revision: https://reviews.freebsd.org/D27577 >=20 > Modified: > head/sys/compat/linuxkpi/common/include/linux/err.h >=20 > Modified: head/sys/compat/linuxkpi/common/include/linux/err.h > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/compat/linuxkpi/common/include/linux/err.h Thu Dec = 17 20:11:31 2020 (r368737) > +++ head/sys/compat/linuxkpi/common/include/linux/err.h Thu Dec = 17 20:28:53 2020 (r368738) > @@ -37,30 +37,30 @@ >=20 > #define MAX_ERRNO 4095 >=20 > -#define IS_ERR_VALUE(x) unlikely((x) >=3D (unsigned long)-MAX_ERRNO) > +#define IS_ERR_VALUE(x) unlikely((x) >=3D (uintptr_t)-MAX_ERRNO) >=20 > static inline void * > ERR_PTR(long error) > { > - return (void *)error; > + return (void *)(intptr_t)error; > } >=20 > static inline long > PTR_ERR(const void *ptr) > { > - return (long)ptr; > + return (intptr_t)ptr; This should probably be (long)(intptr_t) after no longer changing the return type to intptr_t? Jess