From nobody Tue Nov 29 12:14:11 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 4NM1Tv2cSrz4hgfL; Tue, 29 Nov 2022 12:14:11 +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 4NM1Tv2BBhz43Tw; Tue, 29 Nov 2022 12:14:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669724051; 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=ZmHhzEV4CuODNiP6QAhz3XgtutcqCkO1Xodvaro1Bm0=; b=Pk2y0KFfcOP4XqXIYjhQkNA9LYULt0DzcIEALFDZI6zstP5189GGRPDh2BheOBJCEePFZg zPfnzg4CzytHCtNqoBC15wgsFviuRDyNXIE01cdW39cvpiEtpdlRP1l/b/dnPQZggPHe5l anrazAjKLNjeyQ8WWI1y+EmpiPfc3OCTWIdRPoY3KyvsQoYL/NtOZ7F19T17CYsD1exFk+ erxL2ilzCq6AZY4oOrdxfV4utpQcqyRIYTC7wn68OHiz8Wur5VavuVTNz5OuaTRCVL/8gU i0d0DPBNvC0Ju4pJ9t+BITUMZ6pkENXinHDObzlabnyoeATxnhtoNrmLUwyVhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669724051; 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=ZmHhzEV4CuODNiP6QAhz3XgtutcqCkO1Xodvaro1Bm0=; b=ZMC5kZnKZWx/ymVygK0xx40N6EG/Ge/qcK/ASvyLjJCqYYWbZ2yGePw/k6gRzfGU4+Wt/k qhHoPpA351pMTZlGn+y3U64TRs7XBVTYX99ObHgje9a4qrw/qnygLTOq7jiJ10qg3TUs5W rCnD/GeykqJJnGAOXA/5LBf72WnX9YkzIsbn4mmdAW8lK3iPNyGb4EC0VDTYXpd6RIHnTj 3ixpw6gO2gijeEMq5eDE8jvXqRyb64qJb+q9x5n+moezvDEfUbNxfZNb8Sb2MDwabANfvG zNwh5AKAxJujES9+dRN7UrLQOmNLtDPP2n1cFtyj58DJ6dPTJcrrG7Pxjj9ZcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669724051; a=rsa-sha256; cv=none; b=Y9HxgIHKTEWGbNLdspz+ZM5rDeCLn5wpuCswP9CfqYw4VnU0uEus8Qj8Hv4W4z86AAXNIB ARE+oLEsF03NuaH43QDyn/rxjtMoFNmrKQ7aCNebv1TAXOrjb7i3DyOTK79+Abj2ao2Tz4 EJPELb5UlSN6aTRngFxLwEIQNbzxtJeafZGUwQsQqgCGOPBzmZY/M1mHzGt59sBzuIDqF+ BwSN1U/W1+ggih12eDzl+LunZ0biI70SazDk7e3I4/1JkNbDa6B+8vvAptfCEVdyItB7FF vGypPwFCPRA1fqGKIVjYxlUvZ+U2zVCf2EUm9XYu7/sR1njwdbTspeyey+f1+w== 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 4NM1Tv1F0zzH4J; Tue, 29 Nov 2022 12:14:11 +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 2ATCEBCW086641; Tue, 29 Nov 2022 12:14:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2ATCEBXR086640; Tue, 29 Nov 2022 12:14:11 GMT (envelope-from git) Date: Tue, 29 Nov 2022 12:14:11 GMT Message-Id: <202211291214.2ATCEBXR086640@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 2d1dfdab0950 - stable/13 - linuxkpi: Resolve duplicate global symbol name to fix LINT kernel build. 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: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2d1dfdab095051e91ab3ddb07d17be5a860f3b74 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=2d1dfdab095051e91ab3ddb07d17be5a860f3b74 commit 2d1dfdab095051e91ab3ddb07d17be5a860f3b74 Author: Hans Petter Selasky AuthorDate: 2022-09-20 20:36:08 +0000 Commit: Emmanuel Vadot CommitDate: 2022-11-29 12:13:53 +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 (cherry picked from commit cbda8bed15a0de596f72a360debc968343cdc3ce) --- 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 3b15c04503e2..8fb93646f9a5 100644 --- a/sys/compat/linuxkpi/common/include/linux/seq_file.h +++ b/sys/compat/linuxkpi/common/include/linux/seq_file.h @@ -79,8 +79,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 3e82206c0c5a..c358e4ae7dc1 100644 --- a/sys/compat/linuxkpi/common/src/linux_seq_file.c +++ b/sys/compat/linuxkpi/common/src/linux_seq_file.c @@ -217,13 +217,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;