mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-12 10:26:40 +07:00
a0cba2179e
This reverts commit 874f9c7da9.
Geert Uytterhoeven reports:
"This change seems to have an (unintendent?) side-effect.
Before, pr_*() calls without a trailing newline characters would be
printed with a newline character appended, both on the console and in
the output of the dmesg command.
After this commit, no new line character is appended, and the output
of the next pr_*() call of the same type may be appended, like in:
- Truncating RAM at 0x0000000040000000-0x00000000c0000000 to -0x0000000070000000
- Ignoring RAM at 0x0000000200000000-0x0000000240000000 (!CONFIG_HIGHMEM)
+ Truncating RAM at 0x0000000040000000-0x00000000c0000000 to -0x0000000070000000Ignoring RAM at 0x0000000200000000-0x0000000240000000 (!CONFIG_HIGHMEM)"
Joe Perches says:
"No, that is not intentional.
The newline handling code inside vprintk_emit is a bit involved and
for now I suggest a revert until this has all the same behavior as
earlier"
Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Requested-by: Joe Perches <joe@perches.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
58 lines
1.6 KiB
C
58 lines
1.6 KiB
C
/*
|
|
* internal.h - printk internal definitions
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
#include <linux/percpu.h>
|
|
|
|
typedef __printf(1, 0) int (*printk_func_t)(const char *fmt, va_list args);
|
|
|
|
int __printf(1, 0) vprintk_default(const char *fmt, va_list args);
|
|
|
|
#ifdef CONFIG_PRINTK_NMI
|
|
|
|
extern raw_spinlock_t logbuf_lock;
|
|
|
|
/*
|
|
* printk() could not take logbuf_lock in NMI context. Instead,
|
|
* it temporary stores the strings into a per-CPU buffer.
|
|
* The alternative implementation is chosen transparently
|
|
* via per-CPU variable.
|
|
*/
|
|
DECLARE_PER_CPU(printk_func_t, printk_func);
|
|
static inline __printf(1, 0) int vprintk_func(const char *fmt, va_list args)
|
|
{
|
|
return this_cpu_read(printk_func)(fmt, args);
|
|
}
|
|
|
|
extern atomic_t nmi_message_lost;
|
|
static inline int get_nmi_message_lost(void)
|
|
{
|
|
return atomic_xchg(&nmi_message_lost, 0);
|
|
}
|
|
|
|
#else /* CONFIG_PRINTK_NMI */
|
|
|
|
static inline __printf(1, 0) int vprintk_func(const char *fmt, va_list args)
|
|
{
|
|
return vprintk_default(fmt, args);
|
|
}
|
|
|
|
static inline int get_nmi_message_lost(void)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
#endif /* CONFIG_PRINTK_NMI */
|