linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "tip-bot2 for Vincenzo Frascino" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Vincenzo Frascino <vincenzo.frascino@arm.com>,
	Thomas Gleixner <tglx@linutronix.de>,
	Andy Lutomirski <luto@kernel.org>, x86 <x86@kernel.org>,
	LKML <linux-kernel@vger.kernel.org>
Subject: [tip: timers/core] lib/vdso: Build 32 bit specific functions in the right context
Date: Tue, 14 Jan 2020 13:02:23 -0000	[thread overview]
Message-ID: <157900694383.396.6172623174438789034.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20190830135902.20861-3-vincenzo.frascino@arm.com>

The following commit has been merged into the timers/core branch of tip:

Commit-ID:     bf279849ad59538a1518c667c0795ec1fe9dbd66
Gitweb:        https://git.kernel.org/tip/bf279849ad59538a1518c667c0795ec1fe9dbd66
Author:        Vincenzo Frascino <vincenzo.frascino@arm.com>
AuthorDate:    Fri, 30 Aug 2019 14:58:56 +01:00
Committer:     Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Tue, 14 Jan 2020 12:20:44 +01:00

lib/vdso: Build 32 bit specific functions in the right context

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.

Signed-off-by: Vincenzo Frascino <vincenzo.frascino@arm.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Andy Lutomirski <luto@kernel.org>
Link: https://lore.kernel.org/r/20190830135902.20861-3-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 42bd8ab..8e77071 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)
@@ -231,6 +233,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)
 {
@@ -253,4 +256,5 @@ __cvdso_clock_getres_time32(clockid_t clock, struct old_timespec32 *res)
 	}
 	return ret;
 }
+#endif /* BUILD_VDSO32 */
 #endif /* VDSO_HAS_CLOCK_GETRES */

  parent reply	other threads:[~2020-01-14 13:03 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-30 13:58 [PATCH v2 0/8] vdso: Complete the conversion to 32bit syscalls Vincenzo Frascino
2019-08-30 13:58 ` [PATCH v2 1/8] arm64: compat: vdso: Expose BUILD_VDSO32 Vincenzo Frascino
2019-09-03 14:36   ` Vincenzo Frascino
2019-09-03 14:38     ` Will Deacon
2020-01-13 19:09   ` [tip: timers/core] " tip-bot2 for Vincenzo Frascino
2020-01-14 13:02   ` tip-bot2 for Vincenzo Frascino
2019-08-30 13:58 ` [PATCH v2 2/8] lib: vdso: Build 32 bit specific functions in the right context Vincenzo Frascino
2020-01-13 19:09   ` [tip: timers/core] lib/vdso: " tip-bot2 for Vincenzo Frascino
2020-01-13 22:28   ` [PATCH v2 2/8] lib: vdso: " Thomas Gleixner
2020-01-14  9:33     ` Thomas Gleixner
2020-01-14 10:15       ` Vincenzo Frascino
2020-01-14 10:37         ` Thomas Gleixner
2020-01-14 10:41           ` Vincenzo Frascino
2020-01-14 11:15           ` Vincenzo Frascino
2020-01-14 13:02     ` [tip: timers/core] ARM: vdso: Set BUILD_VDSO32 and provide 32bit fallbacks tip-bot2 for Thomas Gleixner
2020-01-14 13:02   ` tip-bot2 for Vincenzo Frascino [this message]
2020-01-16 19:43   ` [PATCH] MIPS: vdso: Define BUILD_VDSO32 when building a 32bit kernel Thomas Gleixner
2020-01-16 20:11     ` Paul Burton
2020-01-16 20:28     ` [tip: timers/core] " tip-bot2 for Thomas Gleixner
2019-08-30 13:58 ` [PATCH v2 3/8] mips: compat: vdso: Use legacy syscalls as fallback Vincenzo Frascino
2019-09-03 13:52   ` Paul Burton
2019-09-03 14:20     ` Vincenzo Frascino
2019-09-03 21:00   ` Paul Burton
2019-08-30 13:58 ` [PATCH v2 4/8] lib: vdso: Remove VDSO_HAS_32BIT_FALLBACK Vincenzo Frascino
2020-01-13 19:09   ` [tip: timers/core] lib/vdso: " tip-bot2 for Vincenzo Frascino
2020-01-14 13:02   ` tip-bot2 for Vincenzo Frascino
2019-08-30 13:58 ` [PATCH v2 5/8] lib: vdso: Remove checks on return value for 32 bit vDSO Vincenzo Frascino
2019-08-30 14:16   ` Vincenzo Frascino
2020-01-13 19:09   ` [tip: timers/core] lib/vdso: " tip-bot2 for Vincenzo Frascino
2020-01-14 13:02   ` tip-bot2 for Vincenzo Frascino
2019-08-30 13:59 ` [PATCH v2 6/8] arm64: compat: vdso: Remove unused VDSO_HAS_32BIT_FALLBACK Vincenzo Frascino
2020-01-13 19:09   ` [tip: timers/core] " tip-bot2 for Vincenzo Frascino
2020-01-14 13:02   ` tip-bot2 for Vincenzo Frascino
2019-08-30 13:59 ` [PATCH v2 7/8] mips: " Vincenzo Frascino
2019-09-03 14:46   ` Paul Burton
2019-09-03 14:51     ` Vincenzo Frascino
2020-01-13 19:09   ` [tip: timers/core] " tip-bot2 for Vincenzo Frascino
2020-01-14 13:02   ` tip-bot2 for Vincenzo Frascino
2019-08-30 13:59 ` [PATCH v2 8/8] x86: " Vincenzo Frascino
2020-01-13 19:09   ` [tip: timers/core] x86/vdso: " tip-bot2 for Vincenzo Frascino
2020-01-14 13:02   ` tip-bot2 for 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=157900694383.396.6172623174438789034.tip-bot2@tip-bot2 \
    --to=tip-bot2@linutronix.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=luto@kernel.org \
    --cc=tglx@linutronix.de \
    --cc=vincenzo.frascino@arm.com \
    --cc=x86@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).