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

Commit bfe4bb15 authored by Miklos Vajna's avatar Miklos Vajna Committed by Thomas Gleixner
Browse files

x86: janitor work in bugs.c 



Just moved trailing statements to the next line, removed space before
open/close parenthesis, wrapped long lines.

Signed-off-by: default avatarMiklos Vajna <vmiklos@frugalware.org>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 23eb271b

arch/x86/kernel/cpu/bugs.c

+19 −8
Original line number Diff line number Diff line
@@ -59,8 +59,12 @@ static void __init check_fpu(void) 
		return;

	}



/* trap_init() enabled FXSR and company _before_ testing for FP problems here. */

	/* Test for the divl bug.. */

	/*

	 * trap_init() enabled FXSR and company _before_ testing for FP

	 * problems here.

	 *

	 * Test for the divl bug..

	 */

	__asm__("fninit\n\t"

		"fldl %1\n\t"

		"fdivl %2\n\t"
@@ -109,9 +113,14 @@ static void __init check_popad(void) 
	  : "=&a" (res)

	  : "d" (inp)

	  : "ecx", "edi");

	/* If this fails, it means that any user program may lock the CPU hard. Too bad. */

	if (res != 12345678) printk( "Buggy.\n" );

		        else printk( "OK.\n" );

	/*

	 * If this fails, it means that any user program may lock the

	 * CPU hard. Too bad.

	 */

	if (res != 12345678)

		printk("Buggy.\n");

	else

		printk("OK.\n");

#endif

}
@@ -137,7 +146,8 @@ static void __init check_config(void) 
 * i486+ only features! (WP works in supervisor mode and the

 * new "invlpg" and "bswap" instructions)

 */

#if defined(CONFIG_X86_WP_WORKS_OK) || defined(CONFIG_X86_INVLPG) || defined(CONFIG_X86_BSWAP)

#if defined(CONFIG_X86_WP_WORKS_OK) || defined(CONFIG_X86_INVLPG) || \

	defined(CONFIG_X86_BSWAP)

	if (boot_cpu_data.x86 == 3)

		panic("Kernel requires i486+ for 'invlpg' and other features");

#endif
@@ -170,6 +180,7 @@ void __init check_bugs(void) 
	check_fpu();

	check_hlt();

	check_popad();

	init_utsname()->machine[1] = '0' + (boot_cpu_data.x86 > 6 ? 6 : boot_cpu_data.x86);

	init_utsname()->machine[1] =

		'0' + (boot_cpu_data.x86 > 6 ? 6 : boot_cpu_data.x86);

	alternative_instructions();

}