[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <170065915799.398.1839657355059760928.tip-bot2@tip-bot2>
Date: Wed, 22 Nov 2023 13:19:17 -0000
From: "tip-bot2 for Arnd Bergmann" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: Arnd Bergmann <arnd@...db.de>,
Thomas Gleixner <tglx@...utronix.de>,
u.kleine-koenig@...gutronix.de, x86@...nel.org,
linux-kernel@...r.kernel.org
Subject: [tip: timers/core] time: Make sysfs_get_uname() function visible in header
The following commit has been merged into the timers/core branch of tip:
Commit-ID: a89299c40911ee29c6ec4fb66f9c598cd947265b
Gitweb: https://git.kernel.org/tip/a89299c40911ee29c6ec4fb66f9c598cd947265b
Author: Arnd Bergmann <arnd@...db.de>
AuthorDate: Wed, 08 Nov 2023 13:58:25 +01:00
Committer: Thomas Gleixner <tglx@...utronix.de>
CommitterDate: Wed, 22 Nov 2023 14:12:10 +01:00
time: Make sysfs_get_uname() function visible in header
This function is defined globally in clocksource.c and used conditionally
in clockevent.c, which the declaration hidden when clockevent support
is disabled. This causes a harmless warning in the definition:
kernel/time/clocksource.c:1324:9: warning: no previous prototype for 'sysfs_get_uname' [-Wmissing-prototypes]
1324 | ssize_t sysfs_get_uname(const char *buf, char *dst, size_t cnt)
Move the declaration out of the #ifdef so it is always visible.
Signed-off-by: Arnd Bergmann <arnd@...db.de>
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
Reviewed-by: Uwe Kleine-König <u.kleine-koenig@...gutronix.de>
Link: https://lore.kernel.org/r/20231108125843.3806765-5-arnd@kernel.org
---
kernel/time/tick-internal.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/kernel/time/tick-internal.h b/kernel/time/tick-internal.h
index 649f2b4..481b7ab 100644
--- a/kernel/time/tick-internal.h
+++ b/kernel/time/tick-internal.h
@@ -56,7 +56,6 @@ extern int clockevents_program_event(struct clock_event_device *dev,
ktime_t expires, bool force);
extern void clockevents_handle_noop(struct clock_event_device *dev);
extern int __clockevents_update_freq(struct clock_event_device *dev, u32 freq);
-extern ssize_t sysfs_get_uname(const char *buf, char *dst, size_t cnt);
/* Broadcasting support */
# ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST
@@ -197,3 +196,5 @@ void hrtimers_resume_local(void);
#else
#define JIFFIES_SHIFT 8
#endif
+
+extern ssize_t sysfs_get_uname(const char *buf, char *dst, size_t cnt);
Powered by blists - more mailing lists