From: Tommi Rantala <tommi.t.rantala@nokia.com>
To: linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org,
Shuah Khan <shuah@kernel.org>
Cc: Tommi Rantala <tommi.t.rantala@nokia.com>
Subject: [PATCH 09/13] selftests: android: fix multiple definition of sock_name
Date: Thu, 8 Oct 2020 15:26:29 +0300 [thread overview]
Message-ID: <20201008122633.687877-10-tommi.t.rantala@nokia.com> (raw)
In-Reply-To: <20201008122633.687877-1-tommi.t.rantala@nokia.com>
Fix multiple definition of sock_name compilation error:
tools/testing/selftests/android/ion/ipcsocket.h:8: multiple definition of `sock_name'
Signed-off-by: Tommi Rantala <tommi.t.rantala@nokia.com>
---
tools/testing/selftests/android/ion/ipcsocket.c | 1 +
tools/testing/selftests/android/ion/ipcsocket.h | 2 --
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/tools/testing/selftests/android/ion/ipcsocket.c b/tools/testing/selftests/android/ion/ipcsocket.c
index 7dc521002095..67ec69410d2e 100644
--- a/tools/testing/selftests/android/ion/ipcsocket.c
+++ b/tools/testing/selftests/android/ion/ipcsocket.c
@@ -10,6 +10,7 @@
#include "ipcsocket.h"
+static char sock_name[MAX_SOCK_NAME_LEN];
int opensocket(int *sockfd, const char *name, int connecttype)
{
diff --git a/tools/testing/selftests/android/ion/ipcsocket.h b/tools/testing/selftests/android/ion/ipcsocket.h
index b3e84498a8a1..ec5efb23e7b0 100644
--- a/tools/testing/selftests/android/ion/ipcsocket.h
+++ b/tools/testing/selftests/android/ion/ipcsocket.h
@@ -5,8 +5,6 @@
#define MAX_SOCK_NAME_LEN 64
-char sock_name[MAX_SOCK_NAME_LEN];
-
/* This structure is responsible for holding the IPC data
* data: hold the buffer fd
* len: just the length of 32-bit integer fd
--
2.26.2
next prev parent reply other threads:[~2020-10-08 12:27 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-08 12:26 [PATCH 00/13] selftests fixes Tommi Rantala
2020-10-08 12:26 ` [PATCH 01/13] selftests: filter kselftest headers from command in lib.mk Tommi Rantala
2020-10-08 20:05 ` Kees Cook
2020-10-09 12:06 ` Christian Brauner
2020-10-08 12:26 ` [PATCH 02/13] selftests: pidfd: fix compilation errors due to wait.h Tommi Rantala
2020-10-08 20:12 ` Kees Cook
2020-10-09 9:43 ` Christian Brauner
2020-10-08 12:26 ` [PATCH 03/13] selftests: add vmaccess to .gitignore Tommi Rantala
2020-10-08 20:05 ` Kees Cook
2020-10-09 12:02 ` Christian Brauner
2020-10-08 12:26 ` [PATCH 04/13] selftests/harness: prettify SKIP message whitespace again Tommi Rantala
2020-10-08 20:06 ` Kees Cook
2020-10-09 12:02 ` Christian Brauner
2020-10-08 12:26 ` [PATCH 05/13] selftests: pidfd: use ksft_test_result_skip() when skipping test Tommi Rantala
2020-10-09 12:03 ` Christian Brauner
2020-10-08 12:26 ` [PATCH 06/13] selftests: pidfd: skip test on kcmp() ENOSYS Tommi Rantala
2020-10-09 12:04 ` Christian Brauner
2020-10-08 12:26 ` [PATCH 07/13] selftests: pidfd: add CONFIG_CHECKPOINT_RESTORE=y to config Tommi Rantala
2020-10-09 12:04 ` Christian Brauner
2020-10-08 12:26 ` [PATCH 08/13] selftests: pidfd: drop needless linux/kcmp.h inclusion in pidfd_setns_test.c Tommi Rantala
2020-10-09 12:04 ` Christian Brauner
2020-10-08 12:26 ` Tommi Rantala [this message]
2020-10-09 12:05 ` [PATCH 09/13] selftests: android: fix multiple definition of sock_name Christian Brauner
2020-11-05 17:14 ` Shuah Khan
2020-10-08 12:26 ` [PATCH 10/13] selftests: proc: fix warning: _GNU_SOURCE redefined Tommi Rantala
2020-10-08 12:26 ` [PATCH 11/13] selftests: core: use SKIP instead of XFAIL in close_range_test.c Tommi Rantala
2020-10-08 20:06 ` Kees Cook
2020-10-09 9:44 ` Christian Brauner
2020-10-08 12:26 ` [PATCH 12/13] selftests: clone3: use SKIP instead of XFAIL Tommi Rantala
2020-10-08 20:06 ` Kees Cook
2020-10-09 9:44 ` Christian Brauner
2020-10-08 12:26 ` [PATCH 13/13] selftests: binderfs: " Tommi Rantala
2020-10-08 20:06 ` Kees Cook
2020-10-09 9:43 ` Christian Brauner
2020-10-09 12:07 ` [PATCH 00/13] selftests fixes Christian Brauner
2020-10-27 23:12 ` Shuah Khan
2020-10-28 1:37 ` Michael Ellerman
2020-10-28 14:31 ` Shuah Khan
2020-10-30 6:15 ` Michael Ellerman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201008122633.687877-10-tommi.t.rantala@nokia.com \
--to=tommi.t.rantala@nokia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=shuah@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.