Re: [PATCH 2/7] Replace DPRINTK with pr_debug in alternative.c

[Alexey Dobriyan]

On Sat, Jun 09, 2007 at 09:08:46AM +0100, Jack Stone wrote:
> This patch converts all DPRINTKs in alternative.c to pr_debug

, rendering "debug-alternative" option useless.

> --- linux/arch/i386/kernel/alternative.c
> +++ linux/arch/i386/kernel/alternative.c
> @@ -1,3 +1,4 @@
> +#include <linux/kernel.h>
>  #include <linux/module.h>
>  #include <linux/sched.h>
>  #include <linux/spinlock.h>
> @@ -41,9 +42,6 @@
>  __setup("noreplace-paravirt", setup_noreplace_paravirt);
>  #endif
> 
> -#define DPRINTK(fmt, args...) if (debug_alternative) \
> -	printk(KERN_DEBUG fmt, args)
> -
>  #ifdef GENERIC_NOP1
>  /* Use inline assembly to define this because the nops are defined
>     as inline assembly strings in the include files and we cannot
> @@ -165,7 +163,7 @@
>  	u8 *instr;
>  	int diff;
> 
> -	DPRINTK("%s: alt table %p -> %p\n", __FUNCTION__, start, end);
> +	pr_debug("%s: alt table %p -> %p\n", __FUNCTION__, start, end);
>  	for (a = start; a < end; a++) {
>  		BUG_ON(a->replacementlen > a->instrlen);
>  		if (!boot_cpu_has(a->cpuid))
> @@ -175,7 +173,7 @@
>  		/* vsyscall code is not mapped yet. resolve it manually. */
>  		if (instr >= (u8 *)VSYSCALL_START && instr < (u8*)VSYSCALL_END) {
>  			instr = __va(instr - (u8*)VSYSCALL_START +
> (u8*)__pa_symbol(&__vsyscall_0));
> -			DPRINTK("%s: vsyscall fixup: %p => %p\n",
> +			pr_debug("%s: vsyscall fixup: %p => %p\n",
>  				__FUNCTION__, a->instr, instr);
>  		}
>  #endif
> @@ -261,7 +259,7 @@
>  	smp->locks_end	= locks_end;
>  	smp->text	= text;
>  	smp->text_end	= text_end;
> -	DPRINTK("%s: locks %p -> %p, text %p -> %p, name %s\n",
> +	pr_debug("%s: locks %p -> %p, text %p -> %p, name %s\n",
>  		__FUNCTION__, smp->locks, smp->locks_end,
>  		smp->text, smp->text_end, smp->name);
> 
> @@ -287,7 +285,7 @@
>  			continue;
>  		list_del(&item->next);
>  		spin_unlock_irqrestore(&smp_alt, flags);
> -		DPRINTK("%s: %s\n", __FUNCTION__, item->name);
> +		pr_debug("%s: %s\n", __FUNCTION__, item->name);

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/