diff options
Diffstat (limited to 'arch/x86/kernel/cpu')
-rw-r--r-- | arch/x86/kernel/cpu/amd.c | 2 | ||||
-rw-r--r-- | arch/x86/kernel/cpu/centaur.c | 4 | ||||
-rw-r--r-- | arch/x86/kernel/cpu/common.c | 2 | ||||
-rw-r--r-- | arch/x86/kernel/cpu/cpufreq/cpufreq-nforce2.c | 2 | ||||
-rw-r--r-- | arch/x86/kernel/cpu/cpufreq/gx-suspmod.c | 8 | ||||
-rw-r--r-- | arch/x86/kernel/cpu/cpufreq/powernow-k6.c | 2 | ||||
-rw-r--r-- | arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 2 | ||||
-rw-r--r-- | arch/x86/kernel/cpu/cpufreq/powernow-k8.h | 4 | ||||
-rw-r--r-- | arch/x86/kernel/cpu/cyrix.c | 10 | ||||
-rw-r--r-- | arch/x86/kernel/cpu/mtrr/cyrix.c | 4 | ||||
-rw-r--r-- | arch/x86/kernel/cpu/mtrr/generic.c | 2 | ||||
-rw-r--r-- | arch/x86/kernel/cpu/mtrr/main.c | 2 |
12 files changed, 22 insertions, 22 deletions
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index 5f8af875f457..1ff88c7f45cf 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c | |||
@@ -266,7 +266,7 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c) | |||
266 | #ifdef CONFIG_X86_HT | 266 | #ifdef CONFIG_X86_HT |
267 | /* | 267 | /* |
268 | * On a AMD multi core setup the lower bits of the APIC id | 268 | * On a AMD multi core setup the lower bits of the APIC id |
269 | * distingush the cores. | 269 | * distinguish the cores. |
270 | */ | 270 | */ |
271 | if (c->x86_max_cores > 1) { | 271 | if (c->x86_max_cores > 1) { |
272 | int cpu = smp_processor_id(); | 272 | int cpu = smp_processor_id(); |
diff --git a/arch/x86/kernel/cpu/centaur.c b/arch/x86/kernel/cpu/centaur.c index 473eac883c7b..9681fa15ddf0 100644 --- a/arch/x86/kernel/cpu/centaur.c +++ b/arch/x86/kernel/cpu/centaur.c | |||
@@ -53,7 +53,7 @@ static u32 __cpuinit ramtop(void) /* 16388 */ | |||
53 | continue; | 53 | continue; |
54 | /* | 54 | /* |
55 | * Don't MCR over reserved space. Ignore the ISA hole | 55 | * Don't MCR over reserved space. Ignore the ISA hole |
56 | * we frob around that catastrophy already | 56 | * we frob around that catastrophe already |
57 | */ | 57 | */ |
58 | 58 | ||
59 | if (e820.map[i].type == E820_RESERVED) | 59 | if (e820.map[i].type == E820_RESERVED) |
@@ -287,7 +287,7 @@ static void __cpuinit init_c3(struct cpuinfo_x86 *c) | |||
287 | c->x86_capability[5] = cpuid_edx(0xC0000001); | 287 | c->x86_capability[5] = cpuid_edx(0xC0000001); |
288 | } | 288 | } |
289 | 289 | ||
290 | /* Cyrix III family needs CX8 & PGE explicity enabled. */ | 290 | /* Cyrix III family needs CX8 & PGE explicitly enabled. */ |
291 | if (c->x86_model >=6 && c->x86_model <= 9) { | 291 | if (c->x86_model >=6 && c->x86_model <= 9) { |
292 | rdmsr (MSR_VIA_FCR, lo, hi); | 292 | rdmsr (MSR_VIA_FCR, lo, hi); |
293 | lo |= (1<<1 | 1<<7); | 293 | lo |= (1<<1 | 1<<7); |
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index d506201d397c..e2fcf2051bdb 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c | |||
@@ -207,7 +207,7 @@ static void __cpuinit get_cpu_vendor(struct cpuinfo_x86 *c, int early) | |||
207 | 207 | ||
208 | static int __init x86_fxsr_setup(char * s) | 208 | static int __init x86_fxsr_setup(char * s) |
209 | { | 209 | { |
210 | /* Tell all the other CPU's to not use it... */ | 210 | /* Tell all the other CPUs to not use it... */ |
211 | disable_x86_fxsr = 1; | 211 | disable_x86_fxsr = 1; |
212 | 212 | ||
213 | /* | 213 | /* |
diff --git a/arch/x86/kernel/cpu/cpufreq/cpufreq-nforce2.c b/arch/x86/kernel/cpu/cpufreq/cpufreq-nforce2.c index 32f0bda3fc95..f03e9153618e 100644 --- a/arch/x86/kernel/cpu/cpufreq/cpufreq-nforce2.c +++ b/arch/x86/kernel/cpu/cpufreq/cpufreq-nforce2.c | |||
@@ -260,7 +260,7 @@ static int nforce2_target(struct cpufreq_policy *policy, | |||
260 | 260 | ||
261 | freqs.old = nforce2_get(policy->cpu); | 261 | freqs.old = nforce2_get(policy->cpu); |
262 | freqs.new = target_fsb * fid * 100; | 262 | freqs.new = target_fsb * fid * 100; |
263 | freqs.cpu = 0; /* Only one CPU on nForce2 plattforms */ | 263 | freqs.cpu = 0; /* Only one CPU on nForce2 platforms */ |
264 | 264 | ||
265 | if (freqs.old == freqs.new) | 265 | if (freqs.old == freqs.new) |
266 | return 0; | 266 | return 0; |
diff --git a/arch/x86/kernel/cpu/cpufreq/gx-suspmod.c b/arch/x86/kernel/cpu/cpufreq/gx-suspmod.c index ed2bda127c44..2ed7db2fd257 100644 --- a/arch/x86/kernel/cpu/cpufreq/gx-suspmod.c +++ b/arch/x86/kernel/cpu/cpufreq/gx-suspmod.c | |||
@@ -12,12 +12,12 @@ | |||
12 | * of any nature resulting due to the use of this software. This | 12 | * of any nature resulting due to the use of this software. This |
13 | * software is provided AS-IS with no warranties. | 13 | * software is provided AS-IS with no warranties. |
14 | * | 14 | * |
15 | * Theoritical note: | 15 | * Theoretical note: |
16 | * | 16 | * |
17 | * (see Geode(tm) CS5530 manual (rev.4.1) page.56) | 17 | * (see Geode(tm) CS5530 manual (rev.4.1) page.56) |
18 | * | 18 | * |
19 | * CPU frequency control on NatSemi Geode GX1/GXLV processor and CS55x0 | 19 | * CPU frequency control on NatSemi Geode GX1/GXLV processor and CS55x0 |
20 | * are based on Suspend Moduration. | 20 | * are based on Suspend Modulation. |
21 | * | 21 | * |
22 | * Suspend Modulation works by asserting and de-asserting the SUSP# pin | 22 | * Suspend Modulation works by asserting and de-asserting the SUSP# pin |
23 | * to CPU(GX1/GXLV) for configurable durations. When asserting SUSP# | 23 | * to CPU(GX1/GXLV) for configurable durations. When asserting SUSP# |
@@ -101,11 +101,11 @@ | |||
101 | 101 | ||
102 | /* SUSCFG bits */ | 102 | /* SUSCFG bits */ |
103 | #define SUSMOD (1<<0) /* enable/disable suspend modulation */ | 103 | #define SUSMOD (1<<0) /* enable/disable suspend modulation */ |
104 | /* the belows support only with cs5530 (after rev.1.2)/cs5530A */ | 104 | /* the below is supported only with cs5530 (after rev.1.2)/cs5530A */ |
105 | #define SMISPDUP (1<<1) /* select how SMI re-enable suspend modulation: */ | 105 | #define SMISPDUP (1<<1) /* select how SMI re-enable suspend modulation: */ |
106 | /* IRQTC timer or read SMI speedup disable reg.(F1BAR[08-09h]) */ | 106 | /* IRQTC timer or read SMI speedup disable reg.(F1BAR[08-09h]) */ |
107 | #define SUSCFG (1<<2) /* enable powering down a GXLV processor. "Special 3Volt Suspend" mode */ | 107 | #define SUSCFG (1<<2) /* enable powering down a GXLV processor. "Special 3Volt Suspend" mode */ |
108 | /* the belows support only with cs5530A */ | 108 | /* the below is supported only with cs5530A */ |
109 | #define PWRSVE_ISA (1<<3) /* stop ISA clock */ | 109 | #define PWRSVE_ISA (1<<3) /* stop ISA clock */ |
110 | #define PWRSVE (1<<4) /* active idle */ | 110 | #define PWRSVE (1<<4) /* active idle */ |
111 | 111 | ||
diff --git a/arch/x86/kernel/cpu/cpufreq/powernow-k6.c b/arch/x86/kernel/cpu/cpufreq/powernow-k6.c index 42405b4e34ed..eb9b62b0830c 100644 --- a/arch/x86/kernel/cpu/cpufreq/powernow-k6.c +++ b/arch/x86/kernel/cpu/cpufreq/powernow-k6.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | * This file was based upon code in Powertweak Linux (http://powertweak.sf.net) | 2 | * This file was based upon code in Powertweak Linux (http://powertweak.sf.net) |
3 | * (C) 2000-2003 Dave Jones, Arjan van de Ven, Janne Pänkälä, Dominik Brodowski. | 3 | * (C) 2000-2003 Dave Jones, Arjan van de Ven, Janne Pänkälä, Dominik Brodowski. |
4 | * | 4 | * |
5 | * Licensed under the terms of the GNU GPL License version 2. | 5 | * Licensed under the terms of the GNU GPL License version 2. |
6 | * | 6 | * |
diff --git a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c index c06ac680c9ca..9c36a53676b7 100644 --- a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c +++ b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c | |||
@@ -168,7 +168,7 @@ static void count_off_irt(struct powernow_k8_data *data) | |||
168 | return; | 168 | return; |
169 | } | 169 | } |
170 | 170 | ||
171 | /* the voltage stabalization time */ | 171 | /* the voltage stabilization time */ |
172 | static void count_off_vst(struct powernow_k8_data *data) | 172 | static void count_off_vst(struct powernow_k8_data *data) |
173 | { | 173 | { |
174 | udelay(data->vstable * VST_UNITS_20US); | 174 | udelay(data->vstable * VST_UNITS_20US); |
diff --git a/arch/x86/kernel/cpu/cpufreq/powernow-k8.h b/arch/x86/kernel/cpu/cpufreq/powernow-k8.h index b06c812208ca..7c4f6e0faed4 100644 --- a/arch/x86/kernel/cpu/cpufreq/powernow-k8.h +++ b/arch/x86/kernel/cpu/cpufreq/powernow-k8.h | |||
@@ -148,10 +148,10 @@ struct powernow_k8_data { | |||
148 | #define PLL_LOCK_CONVERSION (1000/5) /* ms to ns, then divide by clock period */ | 148 | #define PLL_LOCK_CONVERSION (1000/5) /* ms to ns, then divide by clock period */ |
149 | 149 | ||
150 | #define MAXIMUM_VID_STEPS 1 /* Current cpus only allow a single step of 25mV */ | 150 | #define MAXIMUM_VID_STEPS 1 /* Current cpus only allow a single step of 25mV */ |
151 | #define VST_UNITS_20US 20 /* Voltage Stabalization Time is in units of 20us */ | 151 | #define VST_UNITS_20US 20 /* Voltage Stabilization Time is in units of 20us */ |
152 | 152 | ||
153 | /* | 153 | /* |
154 | * Most values of interest are enocoded in a single field of the _PSS | 154 | * Most values of interest are encoded in a single field of the _PSS |
155 | * entries: the "control" value. | 155 | * entries: the "control" value. |
156 | */ | 156 | */ |
157 | 157 | ||
diff --git a/arch/x86/kernel/cpu/cyrix.c b/arch/x86/kernel/cpu/cyrix.c index 122d2d75aa9f..88d66fb8411d 100644 --- a/arch/x86/kernel/cpu/cyrix.c +++ b/arch/x86/kernel/cpu/cyrix.c | |||
@@ -93,7 +93,7 @@ static void __cpuinit check_cx686_slop(struct cpuinfo_x86 *c) | |||
93 | 93 | ||
94 | local_irq_save(flags); | 94 | local_irq_save(flags); |
95 | ccr3 = getCx86(CX86_CCR3); | 95 | ccr3 = getCx86(CX86_CCR3); |
96 | setCx86(CX86_CCR3, (ccr3 & 0x0f) | 0x10); /* enable MAPEN */ | 96 | setCx86(CX86_CCR3, (ccr3 & 0x0f) | 0x10); /* enable MAPEN */ |
97 | ccr5 = getCx86(CX86_CCR5); | 97 | ccr5 = getCx86(CX86_CCR5); |
98 | if (ccr5 & 2) | 98 | if (ccr5 & 2) |
99 | setCx86(CX86_CCR5, ccr5 & 0xfd); /* reset SLOP */ | 99 | setCx86(CX86_CCR5, ccr5 & 0xfd); /* reset SLOP */ |
@@ -115,9 +115,9 @@ static void __cpuinit set_cx86_reorder(void) | |||
115 | 115 | ||
116 | printk(KERN_INFO "Enable Memory access reorder on Cyrix/NSC processor.\n"); | 116 | printk(KERN_INFO "Enable Memory access reorder on Cyrix/NSC processor.\n"); |
117 | ccr3 = getCx86(CX86_CCR3); | 117 | ccr3 = getCx86(CX86_CCR3); |
118 | setCx86(CX86_CCR3, (ccr3 & 0x0f) | 0x10); /* enable MAPEN */ | 118 | setCx86(CX86_CCR3, (ccr3 & 0x0f) | 0x10); /* enable MAPEN */ |
119 | 119 | ||
120 | /* Load/Store Serialize to mem access disable (=reorder it) */ | 120 | /* Load/Store Serialize to mem access disable (=reorder it) */ |
121 | setCx86(CX86_PCR0, getCx86(CX86_PCR0) & ~0x80); | 121 | setCx86(CX86_PCR0, getCx86(CX86_PCR0) & ~0x80); |
122 | /* set load/store serialize from 1GB to 4GB */ | 122 | /* set load/store serialize from 1GB to 4GB */ |
123 | ccr3 |= 0xe0; | 123 | ccr3 |= 0xe0; |
@@ -146,7 +146,7 @@ static void __cpuinit set_cx86_inc(void) | |||
146 | printk(KERN_INFO "Enable Incrementor on Cyrix/NSC processor.\n"); | 146 | printk(KERN_INFO "Enable Incrementor on Cyrix/NSC processor.\n"); |
147 | 147 | ||
148 | ccr3 = getCx86(CX86_CCR3); | 148 | ccr3 = getCx86(CX86_CCR3); |
149 | setCx86(CX86_CCR3, (ccr3 & 0x0f) | 0x10); /* enable MAPEN */ | 149 | setCx86(CX86_CCR3, (ccr3 & 0x0f) | 0x10); /* enable MAPEN */ |
150 | /* PCR1 -- Performance Control */ | 150 | /* PCR1 -- Performance Control */ |
151 | /* Incrementor on, whatever that is */ | 151 | /* Incrementor on, whatever that is */ |
152 | setCx86(CX86_PCR1, getCx86(CX86_PCR1) | 0x02); | 152 | setCx86(CX86_PCR1, getCx86(CX86_PCR1) | 0x02); |
@@ -256,7 +256,7 @@ static void __cpuinit init_cyrix(struct cpuinfo_x86 *c) | |||
256 | u32 vendor, device; | 256 | u32 vendor, device; |
257 | /* It isn't really a PCI quirk directly, but the cure is the | 257 | /* It isn't really a PCI quirk directly, but the cure is the |
258 | same. The MediaGX has deep magic SMM stuff that handles the | 258 | same. The MediaGX has deep magic SMM stuff that handles the |
259 | SB emulation. It thows away the fifo on disable_dma() which | 259 | SB emulation. It throws away the fifo on disable_dma() which |
260 | is wrong and ruins the audio. | 260 | is wrong and ruins the audio. |
261 | 261 | ||
262 | Bug2: VSA1 has a wrap bug so that using maximum sized DMA | 262 | Bug2: VSA1 has a wrap bug so that using maximum sized DMA |
diff --git a/arch/x86/kernel/cpu/mtrr/cyrix.c b/arch/x86/kernel/cpu/mtrr/cyrix.c index 2287d4863a8a..9964be3de2b7 100644 --- a/arch/x86/kernel/cpu/mtrr/cyrix.c +++ b/arch/x86/kernel/cpu/mtrr/cyrix.c | |||
@@ -147,10 +147,10 @@ static void prepare_set(void) | |||
147 | write_cr0(cr0); | 147 | write_cr0(cr0); |
148 | wbinvd(); | 148 | wbinvd(); |
149 | 149 | ||
150 | /* Cyrix ARRs - everything else were excluded at the top */ | 150 | /* Cyrix ARRs - everything else was excluded at the top */ |
151 | ccr3 = getCx86(CX86_CCR3); | 151 | ccr3 = getCx86(CX86_CCR3); |
152 | 152 | ||
153 | /* Cyrix ARRs - everything else were excluded at the top */ | 153 | /* Cyrix ARRs - everything else was excluded at the top */ |
154 | setCx86(CX86_CCR3, (ccr3 & 0x0f) | 0x10); | 154 | setCx86(CX86_CCR3, (ccr3 & 0x0f) | 0x10); |
155 | 155 | ||
156 | } | 156 | } |
diff --git a/arch/x86/kernel/cpu/mtrr/generic.c b/arch/x86/kernel/cpu/mtrr/generic.c index 56f64e34829f..992f08dfbb6c 100644 --- a/arch/x86/kernel/cpu/mtrr/generic.c +++ b/arch/x86/kernel/cpu/mtrr/generic.c | |||
@@ -182,7 +182,7 @@ static inline void k8_enable_fixed_iorrs(void) | |||
182 | 182 | ||
183 | /** | 183 | /** |
184 | * Checks and updates an fixed-range MTRR if it differs from the value it | 184 | * Checks and updates an fixed-range MTRR if it differs from the value it |
185 | * should have. If K8 extenstions are wanted, update the K8 SYSCFG MSR also. | 185 | * should have. If K8 extentions are wanted, update the K8 SYSCFG MSR also. |
186 | * see AMD publication no. 24593, chapter 7.8.1, page 233 for more information | 186 | * see AMD publication no. 24593, chapter 7.8.1, page 233 for more information |
187 | * \param msr MSR address of the MTTR which should be checked and updated | 187 | * \param msr MSR address of the MTTR which should be checked and updated |
188 | * \param changed pointer which indicates whether the MTRR needed to be changed | 188 | * \param changed pointer which indicates whether the MTRR needed to be changed |
diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c index 5e4be30ff903..9abbdf7562c5 100644 --- a/arch/x86/kernel/cpu/mtrr/main.c +++ b/arch/x86/kernel/cpu/mtrr/main.c | |||
@@ -748,7 +748,7 @@ static int __init mtrr_init_finialize(void) | |||
748 | if (use_intel()) | 748 | if (use_intel()) |
749 | mtrr_state_warn(); | 749 | mtrr_state_warn(); |
750 | else { | 750 | else { |
751 | /* The CPUs haven't MTRR and seemes not support SMP. They have | 751 | /* The CPUs haven't MTRR and seem to not support SMP. They have |
752 | * specific drivers, we use a tricky method to support | 752 | * specific drivers, we use a tricky method to support |
753 | * suspend/resume for them. | 753 | * suspend/resume for them. |
754 | * TBD: is there any system with such CPU which supports | 754 | * TBD: is there any system with such CPU which supports |