RepoMirrors/mars
1
0
Fork 0
mirror of https://github.com/schoebel/mars synced 2024-12-18 04:34:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

say: simplify for newer kernels

Browse Source
This commit is contained in:
Thomas Schoebel-Theuer 2022-03-09 17:25:18 +01:00
parent d69d069e7f
commit b0a5594693
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
kernel/brick_say.c
View File

@ -625,7 +625,10 @@ void brick_say_to(struct say_channel *ch, int class, bool dump, const char *pref
if (likely(class >= 0 && class < MAX_SAY_CLASS)) {
wait_channel(ch, class);
spin_lock_irqsave(&ch->ch_lock[class], flags);
#ifdef MARS_OLD_SAY_REPORTING /* to disappear */
/* No longer print the same info twice during the lock.
* Anyway, this code should vanish some day.
*/
_say(ch, class, NULL, true,
"%lld.%09ld %lld.%09ld %s %s[%d] %s:%d %s(): ",
(s64)s_now.tv_sec, s_now.tv_nsec,
@ -634,7 +637,7 @@ void brick_say_to(struct say_channel *ch, int class, bool dump, const char *pref
current->comm, (int)smp_processor_id(),
file, line,
func);
#endif
va_start(args, fmt);
_say(ch, class, args, false, fmt);
va_end(args);
@ -647,7 +650,10 @@ void brick_say_to(struct say_channel *ch, int class, bool dump, const char *pref
if (likely(ch)) {
wait_channel(ch, SAY_TOTAL);
spin_lock_irqsave(&ch->ch_lock[SAY_TOTAL], flags);
#ifdef MARS_OLD_SAY_REPORTING /* to disappear */
/* No longer print the same info twice during the lock.
* Anyway, this code should vanish some day.
*/
_say(ch, SAY_TOTAL, NULL, true,
"%lld.%09ld %lld.%09ld %s_%-5s %s %s[%d] %s:%d %s(): ",
(s64)s_now.tv_sec, s_now.tv_nsec,
@ -657,7 +663,7 @@ void brick_say_to(struct say_channel *ch, int class, bool dump, const char *pref
current->comm, (int)smp_processor_id(),
file, line,
func);
#endif
va_start(args, fmt);
_say(ch, SAY_TOTAL, args, false, fmt);
va_end(args);

2
kernel/compat.h
View File

@ -138,6 +138,8 @@ extern int __oldcompat_unlink(
#if !defined(GENHD_FL_MEDIA_CHANGE_NOTIFY) || \
defined(IOCB_WAITQ)
#define MARS_NEW_BLK_ALLOC_QUEUE
#else
#define MARS_OLD_SAY_REPORTING /* to disappear */
#endif
/* Detect upstream commits