From nobody Mon Jan 10 19:50:31 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 370371954397; Mon, 10 Jan 2022 19:50:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JXkvW5Npmz3NLl; Mon, 10 Jan 2022 19:50:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7D4B032A4; Mon, 10 Jan 2022 19:50:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20AJoVrE005097; Mon, 10 Jan 2022 19:50:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20AJoV8G005096; Mon, 10 Jan 2022 19:50:31 GMT (envelope-from git) Date: Mon, 10 Jan 2022 19:50:31 GMT Message-Id: <202201101950.20AJoV8G005096@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 9a79e08ae761 - main - LinuxKPI: Add clflush argument type conversion wrapper List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9a79e08ae761f1d53c982e1d089b923e25b0092f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641844231; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zl3gFbWCjMdkMA2nYW+oSc+W+wf5j2faWo3L7n45YEs=; b=o284GRrMVTf9dmVr4xTgdTLSghCcWI3hGmIMCYDRrg6Q04Jdlfy9baE47brQQxsdHDvsqk VtoJH+ogVxIivXw1StvQqx8Kd4q2zMwoFTgYKYMsp9cDdeNOiq85inmbz4R1N7ppW4RUJ8 j+d5ZU+0Zm2NFx7CwlroxTnyReEdeS6mSbppd9cSRg+a0MHVSMDqfN4fA75lNAloQ6qhCV aLeeL6oq26XJzaC5JzfFS2gFuInq0TSJ9byKg7ZjHjbA/K2ufM2UDKLEIsRpPkC8nLRUx1 bneS/bZ9HQgnfZU9m85/d4Gk9daY8tnWYNVgYzYE7FCfqljHhTpoWS0/U1e5lw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641844231; a=rsa-sha256; cv=none; b=Nh7N1NYGl0ImgN1UDgyQ8Q+FYspoqPAhYJ/2C5j7lQGxqv/ynO0JCB5QfpKrPezTapn4oP r54EBdIVPshaF3oZk7gSZHH+IJYEECTL90jyoVWLRSn9ZkTZB3fW2W6NTAajCg2J2ssIWP OfuNNXWR1nxYqliXKXZmzVI2/1eKBW3HDq9Laj32JLHeJkLHosRZHHtazNFuvoZn0/5o9E 7X1YaqjoQxMrQ6OFfj6QnOKeJBXOUf9O8d8HK48xKoVTxs61guwHVErUbQ1CbyWNiwe2N+ BNwYoHOKn2p9/wU35uIgof0nv3oRquqHjAuPWng3ZjPzr3Qww5ikNm34z/j/0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=9a79e08ae761f1d53c982e1d089b923e25b0092f commit 9a79e08ae761f1d53c982e1d089b923e25b0092f Author: Vladimir Kondratyev AuthorDate: 2021-11-15 14:48:17 +0000 Commit: Vladimir Kondratyev CommitDate: 2022-01-10 19:49:36 +0000 LinuxKPI: Add clflush argument type conversion wrapper to reduce amount of source patching in drm-kmod. MFC after: 1 week Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D33288 --- sys/compat/linuxkpi/common/include/linux/page.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/page.h b/sys/compat/linuxkpi/common/include/linux/page.h index 0c3d456d6ec0..7cdaf01dce03 100644 --- a/sys/compat/linuxkpi/common/include/linux/page.h +++ b/sys/compat/linuxkpi/common/include/linux/page.h @@ -105,6 +105,7 @@ pgprot2cachemode(pgprot_t prot) #define trunc_page(x) ((uintptr_t)(x) & ~(PAGE_SIZE - 1)) #if defined(__i386__) || defined(__amd64__) +#undef clflush #undef clflushopt static inline void lkpi_clflushopt(unsigned long addr) @@ -116,6 +117,7 @@ lkpi_clflushopt(unsigned long addr) else pmap_invalidate_cache(); } +#define clflush(x) clflush((unsigned long)(x)) #define clflushopt(x) lkpi_clflushopt((unsigned long)(x)) #endif