From nobody Sat Jan 22 19:36:18 2022 X-Original-To: dev-commits-src-branches@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 53684196B08C; Sat, 22 Jan 2022 19:36:20 +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 4Jh61b24x4z3RHL; Sat, 22 Jan 2022 19:36:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642880179; 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=JSVo6hAt0NFxWlQVXEg1ObPIHMaCFj6PVkmubkODulE=; b=Nm9x9c/lWQH5FKCjqh1nd5s48b0/MYjUxa5Ky2QEnrg9RWdyFz5TToKStMSqpkKKrxj7dh eG5CSuluxx05a0pNyxAiFe/xfPtdN5FgwV16bzaKzrF5/BMazmZ7NxVmR52yb2XSId47Ys F+GlT3NFjyR9hxMeV0ECLu3NvGZU07sHrQo1hZGR2SjP5sa2vXxQChmGic+4rtomy6iZv0 1TJ3R+F+xejHN5MHWArASxqudHdiaZnrtQ1qP6MUEF6vh4hjHBwyltUZMSmnhEjRG6+Ve5 leMsgegoJrq7YvohjAjVOCvE1iK+3nXwX1EFKsH9USLdHUOvBYR3sGSs2Q5xgw== 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 227DC14B61; Sat, 22 Jan 2022 19:36:18 +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 20MJaIAg099840; Sat, 22 Jan 2022 19:36:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20MJaIrD099839; Sat, 22 Jan 2022 19:36:18 GMT (envelope-from git) Date: Sat, 22 Jan 2022 19:36:18 GMT Message-Id: <202201221936.20MJaIrD099839@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: e2cc6a467ffc - stable/13 - LinuxKPI: Add clflush argument type conversion wrapper List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: e2cc6a467ffceba665f2a47e698ed840bb5f2ef3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642880179; 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=JSVo6hAt0NFxWlQVXEg1ObPIHMaCFj6PVkmubkODulE=; b=aEfrNHRSgqDH4HJ06QXd2rmekYzJ9+L/pwjOF7Q5j1xzMi2SL//AjP9fTY8SNzLqo32+8V EDjF6itn5MmHmOBkl9bkr7mRWTusbfBrYBG1OBFkxabj5gOgIcUQ9SX6p7yWtXZegutbLZ RxRi4PXahT0XKt7CxMd5RcKfdoAXH5A9w/LDzR8Q9ZppOa3o7t7VQytFVBVAa0l5p6V/rZ gJNDaOsS4xZs5Fv9xbdqbi7ERjlfOWi3euE+20ZqqY/JhNXzEfgRfl+XoFH7Vj9XtF52u8 jF3tr17BRQmhpVATRZiZIwr+VnjgITDcAt4mn8u1X/PGNjNApu0GDt3nmcsk+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642880179; a=rsa-sha256; cv=none; b=WdfpGuC2/NEW6+QONcnkVZcjG23E0njdkJUFQcRZpEXkToIX38URPRGjmILIic0hgUEocl rs/WHYSVWcaetOQAbHe9u45D3R1fuMWuexikUmh6j1n24smRYG7wCqdVIu8c50A9fDKu4n uk4uwfi5h6MQ2cbovLP+hNsw3xloGNIg6aKswJFcRRjYP1viupXnyhCkBx2OlPTvDfTLhF zfkynE3jLAjmYoOWdhH6K/GsKalkEohZDion2hyno8mAQNw7f0jYQyHYE5ko2/3jh4sYqt EzMgW5oXq0XrC0bUUG3epQnUc+NFv/4j3h3uZ/dk6kAOA/QHSOn1Ez+oN9CXKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=e2cc6a467ffceba665f2a47e698ed840bb5f2ef3 commit e2cc6a467ffceba665f2a47e698ed840bb5f2ef3 Author: Vladimir Kondratyev AuthorDate: 2021-11-15 14:48:17 +0000 Commit: Vladimir Kondratyev CommitDate: 2022-01-22 19:34:35 +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 (cherry picked from commit 9a79e08ae761f1d53c982e1d089b923e25b0092f) --- 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