Re: [tip:x86/urgent] x86, printk: Add missing KERN_CONT to NMIselftest

[Joe Perches]

On Mon, 2012-05-21 at 10:25 -0700, tip-bot for Sasha Levin wrote:
> Commit-ID:  29d679ffd850ea37a303bb930142be14982611e4
> Gitweb:     http://git.kernel.org/tip/29d679ffd850ea37a303bb930142be14982611e4
> Author:     Sasha Levin <levinsasha928@xxxxxxxxx>
> AuthorDate: Tue, 8 May 2012 17:56:12 +0200
> Committer:  H. Peter Anvin <hpa@xxxxxxxxx>
> CommitDate: Mon, 21 May 2012 10:13:04 -0700
> 
> x86, printk: Add missing KERN_CONT to NMI selftest
> 
> Fix this behaviour:
> 
> ----------------
> | NMI testsuite:
> --------------------
>   remote IPI:
>   ok  |
> 
>    local IPI:
>   ok  |
> 
> Revealed due to a new modification to printk().
> 
> Signed-off-by: Sasha Levin <levinsasha928@xxxxxxxxx>
> Link: http://lkml.kernel.org/r/1336492573-17530-3-git-send-email-levinsasha928@xxxxxxxxx
> Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxx>
> ---
>  arch/x86/kernel/nmi_selftest.c |   12 ++++++------
>  1 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/arch/x86/kernel/nmi_selftest.c b/arch/x86/kernel/nmi_selftest.c
> index 2c39dcd..9f11dd3 100644
> --- a/arch/x86/kernel/nmi_selftest.c
> +++ b/arch/x86/kernel/nmi_selftest.c
> @@ -117,15 +117,15 @@ static void __init dotest(void (*testcase_fn)(void), int expected)
>  		unexpected_testcase_failures++;
>  
>  		if (nmi_fail == FAILURE)
> -			printk("FAILED |");
> +			printk(KERN_CONT "FAILED |");
>  		else if (nmi_fail == TIMEOUT)
> -			printk("TIMEOUT|");
> +			printk(KERN_CONT "TIMEOUT|");
>  		else
> -			printk("ERROR  |");
> +			printk(KERN_CONT "ERROR  |");
>  		dump_stack();
>  	} else {
>  		testcase_successes++;
> -		printk("  ok  |");
> +		printk(KERN_CONT "  ok  |");
>  	}
>  	testcase_total++;
>  
> @@ -150,10 +150,10 @@ void __init nmi_selftest(void)
>  
>  	print_testname("remote IPI");
>  	dotest(remote_ipi, SUCCESS);
> -	printk("\n");
> +	printk(KERN_CONT "\n");
>  	print_testname("local IPI");
>  	dotest(local_ipi, SUCCESS);
> -	printk("\n");
> +	printk(KERN_CONT "\n");
>  
>  	cleanup_nmi_testsuite();

I believe this change is no longer required.
Kay's printk modifications have been updated.

It's somewhat useful, but the commit message
but not the commit subject is untrue.


--
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/