From nobody Tue Sep 20 20:38:49 2022 X-Original-To: dev-commits-src-main@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 4MXD0T74cQz4dMNV; Tue, 20 Sep 2022 20:38:49 +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 4MXD0T6F6Hz3K4P; Tue, 20 Sep 2022 20:38:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663706329; 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=Yzo5iksIwcOpgHyIluZpKfhcH9UPRHkkKYCa/miFqBU=; b=PErbg+cCSTGY+udjnmdLEXUpSJQGXz7g+9+J+FMIRk6tOMAGIZFFfB/lC56SqW6G1jje0S jAco0cH8cLSoVdCKs5Xy6H91l5Xr3MyUzGxtl3aZ3ol7zW5BAL4ozvMcC8ZNsDCOV/c7JX tRdfLdEey+9Jc8a++tNZd6livePfNMfl5Ei1AHFFWU6TvS8N+87YkkTh6Aa9bRhQg9Oj2S 4AqA+bwnQUHrHB0W4SRq/osoR2wZSGRPRDImJhV4soqa6Hn9DKrxb3kzpf5QhFBCnIBYnw e9L8SqZHUKi0wVi10mb28sHtJU48zIU1yVlNQde4404RI/lc+jxyb8HgsXDcqg== 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 4MXD0T5HhgzqYj; Tue, 20 Sep 2022 20:38:49 +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 28KKcnZp097434; Tue, 20 Sep 2022 20:38:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28KKcnFW097433; Tue, 20 Sep 2022 20:38:49 GMT (envelope-from git) Date: Tue, 20 Sep 2022 20:38:49 GMT Message-Id: <202209202038.28KKcnFW097433@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Hans Petter Selasky Subject: git: cbda8bed15a0 - main - linuxkpi: Resolve duplicate global symbol name to fix LINT kernel build. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: hselasky X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cbda8bed15a0de596f72a360debc968343cdc3ce Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663706329; 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=Yzo5iksIwcOpgHyIluZpKfhcH9UPRHkkKYCa/miFqBU=; b=QFqcTDX5oJnYd5QaDSdMkDzdJFvTRP9/IPv36jwnM2t+nnqGq7Dsw23TMnDw5V6QCB8uOF BQU4rqy+fWx2CMfBi3uArAkHLe1UueRly8REePZ0HyFdspknMm3vPgyXL9rnIVX93sNAmX t2AI0sA/rq8lhSFnzGIOnwTxOpA5+s97h9avaLN6bfjBKWFajo7sUWOSZxfflKxa57wQki uQAwyRlJiEVNbBrxhRAJDfUN6QsGyObWRTRlMqrdPOdST5pBvca1OTKxPdcIZKQRVauMOA 5TOSlmL7Z3zfUq7i8nOKiRgWuczh/HjPAj2CMaKWAE0w1vUL5MT89KyolbV9Tw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663706329; a=rsa-sha256; cv=none; b=f6jxNtU8DQPDtXRPxUTbMNcffyaVSVAB6nlA94HMrX4d/7RC8cyQS/lXWYm2g5H+XwjknH qvrgZDZ9+FGySqRpVN7Aq6tuAQaHkWAccaxwT4vwhOitQyrvVbXeL9yMAD+h9tMSUDFIfE hTYQlhqwtbe/R42MCchWn9JN6t3HPI5eqdbbAaoTGipCw5y227fKato4SAX3vOabiqnugD dhydAmr71OxeWn63K4pHOb0QxTUpfZVGz9AISAKmaGj19jRoeYDc/YKLwKUL6h+fQAn+5P YWe5YnLLlDsuOj1nW5VRt1AuwkdzCbhbiFIalZqP+Ve38Df1I3fZN/TnCFBkAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by hselasky: URL: https://cgit.FreeBSD.org/src/commit/?id=cbda8bed15a0de596f72a360debc968343cdc3ce commit cbda8bed15a0de596f72a360debc968343cdc3ce Author: Hans Petter Selasky AuthorDate: 2022-09-20 20:36:08 +0000 Commit: Hans Petter Selasky CommitDate: 2022-09-20 20:37:15 +0000 linuxkpi: Resolve duplicate global symbol name to fix LINT kernel build. seq_printf() is defined in both spl_procfs_list.c and linux_seq_file.c . Fix this by renaming the LinuxKPI ones and use macros to invoke the correct function. Reported by: jfree@ Differential Revision: https://reviews.freebsd.org/D35883 MFC after: 1 week Sponsored by: NVIDIA Networking --- sys/compat/linuxkpi/common/include/linux/seq_file.h | 7 +++++-- sys/compat/linuxkpi/common/src/linux_seq_file.c | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/seq_file.h b/sys/compat/linuxkpi/common/include/linux/seq_file.h index f40b7984aa50..e925c6d8c2ae 100644 --- a/sys/compat/linuxkpi/common/include/linux/seq_file.h +++ b/sys/compat/linuxkpi/common/include/linux/seq_file.h @@ -76,8 +76,11 @@ off_t seq_lseek(struct linux_file *file, off_t offset, int whence); int single_open(struct linux_file *, int (*)(struct seq_file *, void *), void *); int single_release(struct inode *, struct linux_file *); -void seq_vprintf(struct seq_file *m, const char *fmt, va_list args); -void seq_printf(struct seq_file *m, const char *fmt, ...); +void lkpi_seq_vprintf(struct seq_file *m, const char *fmt, va_list args); +void lkpi_seq_printf(struct seq_file *m, const char *fmt, ...); + +#define seq_vprintf(...) lkpi_seq_vprintf(__VA_ARGS__) +#define seq_printf(...) lkpi_seq_printf(__VA_ARGS__) #define seq_puts(m, str) sbuf_printf((m)->buf, str) #define seq_putc(m, str) sbuf_putc((m)->buf, str) diff --git a/sys/compat/linuxkpi/common/src/linux_seq_file.c b/sys/compat/linuxkpi/common/src/linux_seq_file.c index 4099c9b4d062..054917e2fc24 100644 --- a/sys/compat/linuxkpi/common/src/linux_seq_file.c +++ b/sys/compat/linuxkpi/common/src/linux_seq_file.c @@ -184,13 +184,13 @@ single_release(struct vnode *v, struct linux_file *f) } void -seq_vprintf(struct seq_file *m, const char *fmt, va_list args) +lkpi_seq_vprintf(struct seq_file *m, const char *fmt, va_list args) { sbuf_vprintf(m->buf, fmt, args); } void -seq_printf(struct seq_file *m, const char *fmt, ...) +lkpi_seq_printf(struct seq_file *m, const char *fmt, ...) { va_list args;