From: Vincenzo Frascino <vincenzo.frascino@arm.com>
To: linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, linux-mips@vger.kernel.org
Cc: catalin.marinas@arm.com, will@kernel.org, paul.burton@mips.com,
tglx@linutronix.de, salyzyn@android.com, 0x7f454c46@gmail.com,
luto@kernel.org
Subject: [PATCH 2/7] lib: vdso: Build 32 bit specific functions in the right context
Date: Thu, 29 Aug 2019 12:18:38 +0100 [thread overview]
Message-ID: <20190829111843.41003-3-vincenzo.frascino@arm.com> (raw)
In-Reply-To: <20190829111843.41003-1-vincenzo.frascino@arm.com>
clock_gettime32 and clock_getres_time32 should be compiled only with a
32 bit vdso library.
Exclude these symbols when BUILD_VDSO32 is not defined.
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Andy Lutomirski <luto@kernel.org>
Signed-off-by: Vincenzo Frascino <vincenzo.frascino@arm.com>
---
lib/vdso/gettimeofday.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/lib/vdso/gettimeofday.c b/lib/vdso/gettimeofday.c
index e630e7ff57f1..a86e89e6dedc 100644
--- a/lib/vdso/gettimeofday.c
+++ b/lib/vdso/gettimeofday.c
@@ -117,6 +117,7 @@ __cvdso_clock_gettime(clockid_t clock, struct __kernel_timespec *ts)
return 0;
}
+#ifdef BUILD_VDSO32
static __maybe_unused int
__cvdso_clock_gettime32(clockid_t clock, struct old_timespec32 *res)
{
@@ -139,6 +140,7 @@ __cvdso_clock_gettime32(clockid_t clock, struct old_timespec32 *res)
}
return ret;
}
+#endif /* BUILD_VDSO32 */
static __maybe_unused int
__cvdso_gettimeofday(struct __kernel_old_timeval *tv, struct timezone *tz)
@@ -229,6 +231,7 @@ int __cvdso_clock_getres(clockid_t clock, struct __kernel_timespec *res)
return 0;
}
+#ifdef BUILD_VDSO32
static __maybe_unused int
__cvdso_clock_getres_time32(clockid_t clock, struct old_timespec32 *res)
{
@@ -251,4 +254,5 @@ __cvdso_clock_getres_time32(clockid_t clock, struct old_timespec32 *res)
}
return ret;
}
+#endif /* BUILD_VDSO32 */
#endif /* VDSO_HAS_CLOCK_GETRES */
--
2.23.0
next prev parent reply other threads:[~2019-08-29 11:20 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-29 11:18 [PATCH 0/7] vdso: Complete the conversion to 32bit syscalls Vincenzo Frascino
2019-08-29 11:18 ` [PATCH 1/7] arm64: compat: vdso: Expose BUILD_VDSO32 Vincenzo Frascino
2019-08-30 12:13 ` Catalin Marinas
2019-08-29 11:18 ` Vincenzo Frascino [this message]
2019-08-29 15:23 ` [PATCH 2/7] lib: vdso: Build 32 bit specific functions in the right context Andy Lutomirski
2019-08-29 15:48 ` Vincenzo Frascino
2019-08-29 11:18 ` [PATCH 3/7] mips: compat: vdso: Use legacy syscalls as fallback Vincenzo Frascino
2019-08-29 11:18 ` [PATCH 4/7] lib: vdso: Remove VDSO_HAS_32BIT_FALLBACK Vincenzo Frascino
2019-08-29 15:25 ` Andy Lutomirski
2019-08-29 15:51 ` Vincenzo Frascino
2019-08-29 11:18 ` [PATCH 5/7] arm64: compat: vdso: Remove unused VDSO_HAS_32BIT_FALLBACK Vincenzo Frascino
2019-08-29 12:21 ` Thomas Gleixner
2019-08-29 15:52 ` Vincenzo Frascino
2019-08-30 12:13 ` Catalin Marinas
2019-08-29 11:18 ` [PATCH 6/7] mips: " Vincenzo Frascino
2019-08-29 11:18 ` [PATCH 7/7] x86: " Vincenzo Frascino
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=20190829111843.41003-3-vincenzo.frascino@arm.com \
--to=vincenzo.frascino@arm.com \
--cc=0x7f454c46@gmail.com \
--cc=catalin.marinas@arm.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=luto@kernel.org \
--cc=paul.burton@mips.com \
--cc=salyzyn@android.com \
--cc=tglx@linutronix.de \
--cc=will@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).