aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel
diff options
context:
space:
mode:
authorJan Engelhardt <jengelh@gmx.de>2007-10-19 17:21:04 -0400
committerAdrian Bunk <bunk@kernel.org>2007-10-19 17:21:04 -0400
commit96de0e252cedffad61b3cb5e05662c591898e69a (patch)
treee3eb7d3e65ec27d39e1da13a17f6f0f91b28f5e9 /arch/x86/kernel
parent3f5b98a2a0cba3351f96fcaa6d79aa1a0d93ee78 (diff)
Convert files to UTF-8 and some cleanups
* Convert files to UTF-8. * Also correct some people's names (one example is Eißfeldt, which was found in a source file. Given that the author used an ß at all in a source file indicates that the real name has in fact a 'ß' and not an 'ss', which is commonly used as a substitute for 'ß' when limited to 7bit.) * Correct town names (Goettingen -> Göttingen) * Update Eberhard Mönkeberg's address (http://lkml.org/lkml/2007/1/8/313) Signed-off-by: Jan Engelhardt <jengelh@gmx.de> Signed-off-by: Adrian Bunk <bunk@kernel.org>
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r--arch/x86/kernel/cpu/cpufreq/powernow-k6.c2
-rw-r--r--arch/x86/kernel/cpu/cyrix.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kernel/cpu/cpufreq/powernow-k6.c b/arch/x86/kernel/cpu/cpufreq/powernow-k6.c
index 6d0285339317..a07f6d84033a 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/cyrix.c b/arch/x86/kernel/cpu/cyrix.c
index 122d2d75aa9f..65fa636f410e 100644
--- a/arch/x86/kernel/cpu/cyrix.c
+++ b/arch/x86/kernel/cpu/cyrix.c
@@ -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);