Skip to content

L
linux
Commit 65eb6b43 authored by Paolo Ciarrocchi's avatar Paolo Ciarrocchi Committed by Ingo Molnar
Browse files
Options

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

Before:
   total: 37 errors, 16 warnings, 366 lines checked
After:
   total: 0 errors, 15 warnings, 369 lines checked

No code changed:

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

   text	   data	    bss	    dec	    hex	filename
   1534	    452	      0	   1986	    7c2	intel.o.before
   1534	    452	      0	   1986	    7c2	intel.o.after

md5:
   1ca348a06de6eb354c4b6ea715a57db5  intel.o.before.asm
   1ca348a06de6eb354c4b6ea715a57db5  intel.o.after.asm
Signed-off-by: default avatarPaolo Ciarrocchi <paolo.ciarrocchi@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 60e11746
Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 40 deletions
arch/x86/kernel/cpu/intel.c
View file @ 65eb6b43
...@@ -45,7 +45,7 @@ static void __cpuinit early_init_intel(struct cpuinfo_x86 *c) ...@@ -45,7 +45,7 @@ static void __cpuinit early_init_intel(struct cpuinfo_x86 *c)
* *
* This is called before we do cpu ident work * This is called before we do cpu ident work
*/ */
int __cpuinit ppro_with_ram_bug(void) int __cpuinit ppro_with_ram_bug(void)
{ {
/* Uses data from early_cpu_detect now */ /* Uses data from early_cpu_detect now */
...@@ -58,7 +58,7 @@ int __cpuinit ppro_with_ram_bug(void) ...@@ -58,7 +58,7 @@ int __cpuinit ppro_with_ram_bug(void)
} }
return 0; return 0;
} }
/* /*
* P4 Xeon errata 037 workaround. * P4 Xeon errata 037 workaround.
...@@ -69,7 +69,7 @@ static void __cpuinit Intel_errata_workarounds(struct cpuinfo_x86 *c) ...@@ -69,7 +69,7 @@ static void __cpuinit Intel_errata_workarounds(struct cpuinfo_x86 *c)
unsigned long lo, hi; unsigned long lo, hi;
if ((c->x86 == 15) && (c->x86_model == 1) && (c->x86_mask == 1)) { if ((c->x86 == 15) && (c->x86_model == 1) && (c->x86_mask == 1)) {
rdmsr (MSR_IA32_MISC_ENABLE, lo, hi); rdmsr(MSR_IA32_MISC_ENABLE, lo, hi);
if ((lo & (1<<9)) == 0) { if ((lo & (1<<9)) == 0) {
printk (KERN_INFO "CPU: C0 stepping P4 Xeon detected.\n"); printk (KERN_INFO "CPU: C0 stepping P4 Xeon detected.\n");
printk (KERN_INFO "CPU: Disabling hardware prefetching (Errata 037)\n"); printk (KERN_INFO "CPU: Disabling hardware prefetching (Errata 037)\n");
...@@ -127,10 +127,10 @@ static void __cpuinit init_intel(struct cpuinfo_x86 *c) ...@@ -127,10 +127,10 @@ static void __cpuinit init_intel(struct cpuinfo_x86 *c)
*/ */
c->f00f_bug = 0; c->f00f_bug = 0;
if (!paravirt_enabled() && c->x86 == 5) { if (!paravirt_enabled() && c->x86 == 5) {
static int f00f_workaround_enabled = 0; static int f00f_workaround_enabled;
c->f00f_bug = 1; c->f00f_bug = 1;
if ( !f00f_workaround_enabled ) { if (!f00f_workaround_enabled) {
trap_init_f00f_bug(); trap_init_f00f_bug();
printk(KERN_NOTICE "Intel Pentium with F0 0F bug - workaround enabled.\n"); printk(KERN_NOTICE "Intel Pentium with F0 0F bug - workaround enabled.\n");
f00f_workaround_enabled = 1; f00f_workaround_enabled = 1;
...@@ -139,7 +139,7 @@ static void __cpuinit init_intel(struct cpuinfo_x86 *c) ...@@ -139,7 +139,7 @@ static void __cpuinit init_intel(struct cpuinfo_x86 *c)
#endif #endif
l2 = init_intel_cacheinfo(c); l2 = init_intel_cacheinfo(c);
if (c->cpuid_level > 9 ) { if (c->cpuid_level > 9) {
unsigned eax = cpuid_eax(10); unsigned eax = cpuid_eax(10);
/* Check for version and the number of counters */ /* Check for version and the number of counters */
if ((eax & 0xff) && (((eax>>8) & 0xff) > 1)) if ((eax & 0xff) && (((eax>>8) & 0xff) > 1))
...@@ -150,9 +150,11 @@ static void __cpuinit init_intel(struct cpuinfo_x86 *c) ...@@ -150,9 +150,11 @@ static void __cpuinit init_intel(struct cpuinfo_x86 *c)
if ((c->x86<<8 | c->x86_model<<4 | c->x86_mask) < 0x633) if ((c->x86<<8 | c->x86_model<<4 | c->x86_mask) < 0x633)
clear_bit(X86_FEATURE_SEP, c->x86_capability); clear_bit(X86_FEATURE_SEP, c->x86_capability);
/* Names for the Pentium II/Celeron processors /*
detectable only by also checking the cache size. * Names for the Pentium II/Celeron processors
Dixon is NOT a Celeron. */ * detectable only by also checking the cache size.
* Dixon is NOT a Celeron.
*/
if (c->x86 == 6) { if (c->x86 == 6) {
switch (c->x86_model) { switch (c->x86_model) {
case 5: case 5:
...@@ -163,14 +165,14 @@ static void __cpuinit init_intel(struct cpuinfo_x86 *c) ...@@ -163,14 +165,14 @@ static void __cpuinit init_intel(struct cpuinfo_x86 *c)
p = "Mobile Pentium II (Dixon)"; p = "Mobile Pentium II (Dixon)";
} }
break; break;
case 6: case 6:
if (l2 == 128) if (l2 == 128)
p = "Celeron (Mendocino)"; p = "Celeron (Mendocino)";
else if (c->x86_mask == 0 || c->x86_mask == 5) else if (c->x86_mask == 0 || c->x86_mask == 5)
p = "Celeron-A"; p = "Celeron-A";
break; break;
case 8: case 8:
if (l2 == 128) if (l2 == 128)
p = "Celeron (Coppermine)"; p = "Celeron (Coppermine)";
...@@ -178,9 +180,9 @@ static void __cpuinit init_intel(struct cpuinfo_x86 *c) ...@@ -178,9 +180,9 @@ static void __cpuinit init_intel(struct cpuinfo_x86 *c)
} }
} }
if ( p ) if (p)
strcpy(c->x86_model_id, p); strcpy(c->x86_model_id, p);
c->x86_max_cores = num_cpu_cores(c); c->x86_max_cores = num_cpu_cores(c);
detect_ht(c); detect_ht(c);
...@@ -211,7 +213,7 @@ static void __cpuinit init_intel(struct cpuinfo_x86 *c) ...@@ -211,7 +213,7 @@ static void __cpuinit init_intel(struct cpuinfo_x86 *c)
if (c->x86 == 15) { if (c->x86 == 15) {
set_bit(X86_FEATURE_P4, c->x86_capability); set_bit(X86_FEATURE_P4, c->x86_capability);
} }
if (c->x86 == 6) if (c->x86 == 6)
set_bit(X86_FEATURE_P3, c->x86_capability); set_bit(X86_FEATURE_P3, c->x86_capability);
if (cpu_has_ds) { if (cpu_has_ds) {
unsigned int l1; unsigned int l1;
...@@ -226,9 +228,10 @@ static void __cpuinit init_intel(struct cpuinfo_x86 *c) ...@@ -226,9 +228,10 @@ static void __cpuinit init_intel(struct cpuinfo_x86 *c)
ds_init_intel(c); ds_init_intel(c);
} }
static unsigned int __cpuinit intel_size_cache(struct cpuinfo_x86 * c, unsigned int size) static unsigned int __cpuinit intel_size_cache(struct cpuinfo_x86 *c, unsigned int size)
{ {
/* Intel PIII Tualatin. This comes in two flavours. /*
* Intel PIII Tualatin. This comes in two flavours.
* One has 256kb of cache, the other 512. We have no way * One has 256kb of cache, the other 512. We have no way
* to determine which, so we use a boottime override * to determine which, so we use a boottime override
* for the 512kb model, and assume 256 otherwise. * for the 512kb model, and assume 256 otherwise.
...@@ -240,42 +243,42 @@ static unsigned int __cpuinit intel_size_cache(struct cpuinfo_x86 * c, unsigned ...@@ -240,42 +243,42 @@ static unsigned int __cpuinit intel_size_cache(struct cpuinfo_x86 * c, unsigned
static struct cpu_dev intel_cpu_dev __cpuinitdata = { static struct cpu_dev intel_cpu_dev __cpuinitdata = {
.c_vendor = "Intel", .c_vendor = "Intel",
.c_ident = { "GenuineIntel" }, .c_ident = { "GenuineIntel" },
.c_models = { .c_models = {
{ .vendor = X86_VENDOR_INTEL, .family = 4, .model_names = { .vendor = X86_VENDOR_INTEL, .family = 4, .model_names =
{ {
[0] = "486 DX-25/33", [0] = "486 DX-25/33",
[1] = "486 DX-50", [1] = "486 DX-50",
[2] = "486 SX", [2] = "486 SX",
[3] = "486 DX/2", [3] = "486 DX/2",
[4] = "486 SL", [4] = "486 SL",
[5] = "486 SX/2", [5] = "486 SX/2",
[7] = "486 DX/2-WB", [7] = "486 DX/2-WB",
[8] = "486 DX/4", [8] = "486 DX/4",
[9] = "486 DX/4-WB" [9] = "486 DX/4-WB"
} }
}, },
{ .vendor = X86_VENDOR_INTEL, .family = 5, .model_names = { .vendor = X86_VENDOR_INTEL, .family = 5, .model_names =
{ {
[0] = "Pentium 60/66 A-step", [0] = "Pentium 60/66 A-step",
[1] = "Pentium 60/66", [1] = "Pentium 60/66",
[2] = "Pentium 75 - 200", [2] = "Pentium 75 - 200",
[3] = "OverDrive PODP5V83", [3] = "OverDrive PODP5V83",
[4] = "Pentium MMX", [4] = "Pentium MMX",
[7] = "Mobile Pentium 75 - 200", [7] = "Mobile Pentium 75 - 200",
[8] = "Mobile Pentium MMX" [8] = "Mobile Pentium MMX"
} }
}, },
{ .vendor = X86_VENDOR_INTEL, .family = 6, .model_names = { .vendor = X86_VENDOR_INTEL, .family = 6, .model_names =
{ {
[0] = "Pentium Pro A-step", [0] = "Pentium Pro A-step",
[1] = "Pentium Pro", [1] = "Pentium Pro",
[3] = "Pentium II (Klamath)", [3] = "Pentium II (Klamath)",
[4] = "Pentium II (Deschutes)", [4] = "Pentium II (Deschutes)",
[5] = "Pentium II (Deschutes)", [5] = "Pentium II (Deschutes)",
[6] = "Mobile Pentium II", [6] = "Mobile Pentium II",
[7] = "Pentium III (Katmai)", [7] = "Pentium III (Katmai)",
[8] = "Pentium III (Coppermine)", [8] = "Pentium III (Coppermine)",
[10] = "Pentium III (Cascades)", [10] = "Pentium III (Cascades)",
[11] = "Pentium III (Tualatin)", [11] = "Pentium III (Tualatin)",
} }
...@@ -361,5 +364,5 @@ unsigned long long cmpxchg_486_u64(volatile void *ptr, u64 old, u64 new) ...@@ -361,5 +364,5 @@ unsigned long long cmpxchg_486_u64(volatile void *ptr, u64 old, u64 new)
EXPORT_SYMBOL(cmpxchg_486_u64); EXPORT_SYMBOL(cmpxchg_486_u64);
#endif #endif
// arch_initcall(intel_cpu_init); /* arch_initcall(intel_cpu_init); */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7