printk: remove used-once early_vprintk
Eliminate the unlikely possibility of message interleaving for early_printk/early_vprintk use. early_vprintk can be done via the %pV extension so remove this unnecessary function and change early_printk to have the equivalent vprintk code. All uses of early_printk already end with a newline so also remove the unnecessary newline from the early_printk function. Signed-off-by: Joe Perches <joe@perches.com> Acked-by: Chris Metcalf <cmetcalf@tilera.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
9e3961a097
commit
1dc6244bd6
|
@ -43,13 +43,20 @@ static struct console early_hv_console = {
|
|||
|
||||
void early_panic(const char *fmt, ...)
|
||||
{
|
||||
va_list ap;
|
||||
struct va_format vaf;
|
||||
va_list args;
|
||||
|
||||
arch_local_irq_disable_all();
|
||||
va_start(ap, fmt);
|
||||
early_printk("Kernel panic - not syncing: ");
|
||||
early_vprintk(fmt, ap);
|
||||
early_printk("\n");
|
||||
va_end(ap);
|
||||
|
||||
va_start(args, fmt);
|
||||
|
||||
vaf.fmt = fmt;
|
||||
vaf.va = &args;
|
||||
|
||||
early_printk("Kernel panic - not syncing: %pV", &vaf);
|
||||
|
||||
va_end(args);
|
||||
|
||||
dump_stack();
|
||||
hv_halt();
|
||||
}
|
||||
|
|
|
@ -118,7 +118,6 @@ int no_printk(const char *fmt, ...)
|
|||
#ifdef CONFIG_EARLY_PRINTK
|
||||
extern asmlinkage __printf(1, 2)
|
||||
void early_printk(const char *fmt, ...);
|
||||
void early_vprintk(const char *fmt, va_list ap);
|
||||
#else
|
||||
static inline __printf(1, 2) __cold
|
||||
void early_printk(const char *s, ...) { }
|
||||
|
|
|
@ -1881,23 +1881,20 @@ static size_t cont_print_text(char *text, size_t size) { return 0; }
|
|||
#ifdef CONFIG_EARLY_PRINTK
|
||||
struct console *early_console;
|
||||
|
||||
void early_vprintk(const char *fmt, va_list ap)
|
||||
{
|
||||
if (early_console) {
|
||||
char buf[512];
|
||||
int n = vscnprintf(buf, sizeof(buf), fmt, ap);
|
||||
|
||||
early_console->write(early_console, buf, n);
|
||||
}
|
||||
}
|
||||
|
||||
asmlinkage __visible void early_printk(const char *fmt, ...)
|
||||
{
|
||||
va_list ap;
|
||||
char buf[512];
|
||||
int n;
|
||||
|
||||
if (!early_console)
|
||||
return;
|
||||
|
||||
va_start(ap, fmt);
|
||||
early_vprintk(fmt, ap);
|
||||
n = vscnprintf(buf, sizeof(buf), fmt, ap);
|
||||
va_end(ap);
|
||||
|
||||
early_console->write(early_console, buf, n);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
Loading…
Reference in New Issue