Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5da527aa authored by Kay Sievers's avatar Kay Sievers Committed by Greg Kroah-Hartman
Browse files

printk(): add KERN_CONT where needed in hpet and vt code 



A prototype for kmsg records instead of a byte-stream buffer revealed
a couple of missing printk(KERN_CONT ...) uses. Subsequent calls produce
one record per printk() call, while all should have ended up in a single
record.

Instead of:
  ACPI: (supports S0 S5)
  ACPI: PCI Interrupt Link [LNKA] (IRQs 5 *10 11)
  hpet0: at MMIO 0xfed00000, IRQs 2 , 8 , 0

It prints:
  ACPI: (supports S0
   S5
  )
  ACPI: PCI Interrupt Link [LNKA] (IRQs
   5
   *10
   11
  )
  hpet0: at MMIO 0xfed00000, IRQs
   2
  , 8
  , 0

Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Len Brown <lenb@kernel.org>
Signed-off-by: default avatarKay Sievers <kay@vrfy.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 57c36868

drivers/char/hpet.c

+2 −2
Original line number Diff line number Diff line
@@ -906,8 +906,8 @@ int hpet_alloc(struct hpet_data *hdp) 
		hpetp->hp_which, hdp->hd_phys_address,

		hpetp->hp_ntimer > 1 ? "s" : "");

	for (i = 0; i < hpetp->hp_ntimer; i++)

		printk("%s %d", i > 0 ? "," : "", hdp->hd_irq[i]);

	printk("\n");

		printk(KERN_CONT "%s %d", i > 0 ? "," : "", hdp->hd_irq[i]);

	printk(KERN_CONT "\n");



	temp = hpetp->hp_tick_freq;

	remainder = do_div(temp, 1000000);

drivers/tty/vt/vt.c

+1 −2
Original line number Diff line number Diff line
@@ -2932,11 +2932,10 @@ static int __init con_init(void) 
	gotoxy(vc, vc->vc_x, vc->vc_y);

	csi_J(vc, 0);

	update_screen(vc);

	pr_info("Console: %s %s %dx%d",

	pr_info("Console: %s %s %dx%d\n",

		vc->vc_can_do_color ? "colour" : "mono",

		display_desc, vc->vc_cols, vc->vc_rows);

	printable = 1;

	printk("\n");



	console_unlock();