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

Commit 34048c9e authored by Paolo Ciarrocchi's avatar Paolo Ciarrocchi Committed by Ingo Molnar
Browse files

x86: coding style fixes to arch/x86/kernel/cpu/common.c 



Before:
   total: 55 errors, 6 warnings, 727 lines checked
After:
   total: 0 errors, 3 warnings, 734 lines checked

No code changed:

arch/x86/kernel/cpu/common.o:

   text	   data	    bss	    dec	    hex	filename
   3500	   4611	     44	   8155	   1fdb	common.o.before
   3500	   4611	     44	   8155	   1fdb	common.o.after

md5:
   e37091f11fbeb682c0db152ac3022a38  common.o.before.asm
   e37091f11fbeb682c0db152ac3022a38  common.o.after.asm

Signed-off-by: default avatarPaolo Ciarrocchi <paolo.ciarrocchi@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent db965984

arch/x86/kernel/cpu/common.c

+56 −49
Original line number Diff line number Diff line
@@ -156,9 +156,12 @@ void __cpuinit display_cacheinfo(struct cpuinfo_x86 *c) 
	       l2size, ecx & 0xFF);

}



/* Naming convention should be: <Name> [(<Codename>)] */

/* This table only is used unless init_<vendor>() below doesn't set it; */

/* in particular, if CPUID levels 0x80000002..4 are supported, this isn't used */

/*

 * Naming convention should be: <Name> [(<Codename>)]

 * This table only is used unless init_<vendor>() below doesn't set it;

 * in particular, if CPUID levels 0x80000002..4 are supported, this isn't used

 *

 */



/* Look up CPU names by table lookup. */

static char __cpuinit *table_lookup_model(struct cpuinfo_x86 *c)
@@ -308,12 +311,15 @@ static void __cpuinit early_get_cap(struct cpuinfo_x86 *c) 


}



/* Do minimum CPU detection early.

   Fields really needed: vendor, cpuid_level, family, model, mask, cache alignment.

   The others are not touched to avoid unwanted side effects.



   WARNING: this function is only called on the BP.  Don't add code here

   that is supposed to run on all CPUs. */

/*

 * Do minimum CPU detection early.

 * Fields really needed: vendor, cpuid_level, family, model, mask,

 * cache alignment.

 * The others are not touched to avoid unwanted side effects.

 *

 * WARNING: this function is only called on the BP.  Don't add code here

 * that is supposed to run on all CPUs.

 */

static void __init early_cpu_detect(void)

{

	struct cpuinfo_x86 *c = &boot_cpu_data;
@@ -350,7 +356,6 @@ static void __cpuinit generic_identify(struct cpuinfo_x86 * c) 
		get_cpu_vendor(c, 0);

		/* Initialize the standard set of capabilities */

		/* Note that the vendor-specific code below might override */

	

		/* Intel-defined flags: level 0x00000001 */

		if (c->cpuid_level >= 0x00000001) {

			u32 capability, excap;
@@ -439,8 +444,10 @@ void __cpuinit identify_cpu(struct cpuinfo_x86 *c) 
	memset(&c->x86_capability, 0, sizeof c->x86_capability);



	if (!have_cpuid_p()) {

		/* First of all, decide if this is a 486 or higher */

		/* It's a 486 if we can modify the AC flag */

		/*

		 * First of all, decide if this is a 486 or higher

		 * It's a 486 if we can modify the AC flag

		 */

		if (flag_is_changeable_p(X86_EFLAGS_AC))

			c->x86 = 4;

		else