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

Commit a9c56953 authored by Minchan Kim's avatar Minchan Kim Committed by Linus Torvalds
Browse files

use printk_once() in several places 



There are some places to be able to use printk_once instead of hard coding.

Signed-off-by: default avatarMinchan Kim <minchan.kim@gmail.com>
Cc: Dominik Brodowski <linux@dominikbrodowski.net>
Cc: David S. Miller <davem@davemloft.net>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 009789f0

arch/x86/kernel/cpu/common.c

+3 −8
Original line number Diff line number Diff line
@@ -487,7 +487,6 @@ void __cpuinit detect_ht(struct cpuinfo_x86 *c) 
static void __cpuinit get_cpu_vendor(struct cpuinfo_x86 *c)

{

	char *v = c->x86_vendor_id;

	static int printed;

	int i;



	for (i = 0; i < X86_VENDOR_NUM; i++) {
@@ -504,13 +503,9 @@ static void __cpuinit get_cpu_vendor(struct cpuinfo_x86 *c) 
		}

	}



	if (!printed) {

		printed++;

		printk(KERN_ERR

		    "CPU: vendor_id '%s' unknown, using generic init.\n", v);



		printk(KERN_ERR "CPU: Your system may be unstable.\n");

	}

	printk_once(KERN_ERR

			"CPU: vendor_id '%s' unknown, using generic init.\n" \

			"CPU: Your system may be unstable.\n", v);



	c->x86_vendor = X86_VENDOR_UNKNOWN;

	this_cpu = &default_cpu;

drivers/pcmcia/pcmcia_ioctl.c

+3 −6
Original line number Diff line number Diff line
@@ -915,12 +915,9 @@ static int ds_ioctl(struct inode * inode, struct file * file, 
		err = -EPERM;

		goto free_out;

	} else {

		static int printed = 0;

		if (!printed) {

			printk(KERN_WARNING "2.6. kernels use pcmciamtd instead of memory_cs.c and do not require special\n");

			printk(KERN_WARNING "MTD handling any more.\n");

			printed++;

		}

			printk_once(KERN_WARNING

				"2.6. kernels use pcmciamtd instead of memory_cs.c and do not require special\n");

			printk_once(KERN_WARNING "MTD handling any more.\n");

	}

	err = -EINVAL;

	goto free_out;