diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 23:36:17 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 23:36:17 -0400 |
commit | c00046c279a2521075250fad682ca0acc10d4fd7 (patch) | |
tree | 78a7e9089c26f199ad9b0161bb564b7c1ca6daf9 /arch/x86 | |
parent | 9abbf7d028b1598b40ebdc81c48f30da7f3d5bf5 (diff) | |
parent | 8e8a1407ac23b43cec0412338c1b4f5e1c664550 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (74 commits)
fix do_sys_open() prototype
sysfs: trivial: fix sysfs_create_file kerneldoc spelling mistake
Documentation: Fix typo in SubmitChecklist.
Typo: depricated -> deprecated
Add missing profile=kvm option to Documentation/kernel-parameters.txt
fix typo about TBI in e1000 comment
proc.txt: Add /proc/stat field
small documentation fixes
Fix compiler warning in smount example program from sharedsubtree.txt
docs/sysfs: add missing word to sysfs attribute explanation
documentation/ext3: grammar fixes
Documentation/java.txt: typo and grammar fixes
Documentation/filesystems/vfs.txt: typo fix
include/asm-*/system.h: remove unused set_rmb(), set_wmb() macros
trivial copy_data_pages() tidy up
Fix typo in arch/x86/kernel/tsc_32.c
file link fix for Pegasus USB net driver help
remove unused return within void return function
Typo fixes retrun -> return
x86 hpet.h: remove broken links
...
Diffstat (limited to 'arch/x86')
48 files changed, 78 insertions, 78 deletions
diff --git a/arch/x86/boot/compressed/misc_32.c b/arch/x86/boot/compressed/misc_32.c index b28505c544c9..1dc1e19c0a9f 100644 --- a/arch/x86/boot/compressed/misc_32.c +++ b/arch/x86/boot/compressed/misc_32.c | |||
@@ -25,7 +25,7 @@ | |||
25 | 25 | ||
26 | /* | 26 | /* |
27 | * Getting to provable safe in place decompression is hard. | 27 | * Getting to provable safe in place decompression is hard. |
28 | * Worst case behaviours need to be analized. | 28 | * Worst case behaviours need to be analyzed. |
29 | * Background information: | 29 | * Background information: |
30 | * | 30 | * |
31 | * The file layout is: | 31 | * The file layout is: |
@@ -94,7 +94,7 @@ | |||
94 | * Adding 32768 instead of 32767 just makes for round numbers. | 94 | * Adding 32768 instead of 32767 just makes for round numbers. |
95 | * Adding the decompressor_size is necessary as it musht live after all | 95 | * Adding the decompressor_size is necessary as it musht live after all |
96 | * of the data as well. Last I measured the decompressor is about 14K. | 96 | * of the data as well. Last I measured the decompressor is about 14K. |
97 | * 10K of actuall data and 4K of bss. | 97 | * 10K of actual data and 4K of bss. |
98 | * | 98 | * |
99 | */ | 99 | */ |
100 | 100 | ||
diff --git a/arch/x86/boot/compressed/misc_64.c b/arch/x86/boot/compressed/misc_64.c index f932b0e89096..6ea015aa65e4 100644 --- a/arch/x86/boot/compressed/misc_64.c +++ b/arch/x86/boot/compressed/misc_64.c | |||
@@ -25,7 +25,7 @@ | |||
25 | 25 | ||
26 | /* | 26 | /* |
27 | * Getting to provable safe in place decompression is hard. | 27 | * Getting to provable safe in place decompression is hard. |
28 | * Worst case behaviours need to be analized. | 28 | * Worst case behaviours need to be analyzed. |
29 | * Background information: | 29 | * Background information: |
30 | * | 30 | * |
31 | * The file layout is: | 31 | * The file layout is: |
@@ -94,7 +94,7 @@ | |||
94 | * Adding 32768 instead of 32767 just makes for round numbers. | 94 | * Adding 32768 instead of 32767 just makes for round numbers. |
95 | * Adding the decompressor_size is necessary as it musht live after all | 95 | * Adding the decompressor_size is necessary as it musht live after all |
96 | * of the data as well. Last I measured the decompressor is about 14K. | 96 | * of the data as well. Last I measured the decompressor is about 14K. |
97 | * 10K of actuall data and 4K of bss. | 97 | * 10K of actual data and 4K of bss. |
98 | * | 98 | * |
99 | */ | 99 | */ |
100 | 100 | ||
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index f28b2e251b1d..289247d974c6 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c | |||
@@ -99,7 +99,7 @@ static u64 acpi_lapic_addr __initdata = APIC_DEFAULT_PHYS_BASE; | |||
99 | 99 | ||
100 | /* | 100 | /* |
101 | * The default interrupt routing model is PIC (8259). This gets | 101 | * The default interrupt routing model is PIC (8259). This gets |
102 | * overriden if IOAPICs are enumerated (below). | 102 | * overridden if IOAPICs are enumerated (below). |
103 | */ | 103 | */ |
104 | enum acpi_irq_model_id acpi_irq_model = ACPI_IRQ_MODEL_PIC; | 104 | enum acpi_irq_model_id acpi_irq_model = ACPI_IRQ_MODEL_PIC; |
105 | 105 | ||
@@ -414,8 +414,8 @@ acpi_parse_nmi_src(struct acpi_subtable_header * header, const unsigned long end | |||
414 | * | 414 | * |
415 | * Port 0x4d0-4d1 are ECLR1 and ECLR2, the Edge/Level Control Registers | 415 | * Port 0x4d0-4d1 are ECLR1 and ECLR2, the Edge/Level Control Registers |
416 | * for the 8259 PIC. bit[n] = 1 means irq[n] is Level, otherwise Edge. | 416 | * for the 8259 PIC. bit[n] = 1 means irq[n] is Level, otherwise Edge. |
417 | * ECLR1 is IRQ's 0-7 (IRQ 0, 1, 2 must be 0) | 417 | * ECLR1 is IRQs 0-7 (IRQ 0, 1, 2 must be 0) |
418 | * ECLR2 is IRQ's 8-15 (IRQ 8, 13 must be 0) | 418 | * ECLR2 is IRQs 8-15 (IRQ 8, 13 must be 0) |
419 | */ | 419 | */ |
420 | 420 | ||
421 | void __init acpi_pic_sci_set_trigger(unsigned int irq, u16 trigger) | 421 | void __init acpi_pic_sci_set_trigger(unsigned int irq, u16 trigger) |
@@ -427,7 +427,7 @@ void __init acpi_pic_sci_set_trigger(unsigned int irq, u16 trigger) | |||
427 | old = inb(0x4d0) | (inb(0x4d1) << 8); | 427 | old = inb(0x4d0) | (inb(0x4d1) << 8); |
428 | 428 | ||
429 | /* | 429 | /* |
430 | * If we use ACPI to set PCI irq's, then we should clear ELCR | 430 | * If we use ACPI to set PCI IRQs, then we should clear ELCR |
431 | * since we will set it correctly as we enable the PCI irq | 431 | * since we will set it correctly as we enable the PCI irq |
432 | * routing. | 432 | * routing. |
433 | */ | 433 | */ |
diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c index 793341fffc81..08b07c176962 100644 --- a/arch/x86/kernel/apic_32.c +++ b/arch/x86/kernel/apic_32.c | |||
@@ -947,7 +947,7 @@ void __devinit setup_local_APIC(void) | |||
947 | * Set up LVT0, LVT1: | 947 | * Set up LVT0, LVT1: |
948 | * | 948 | * |
949 | * set up through-local-APIC on the BP's LINT0. This is not | 949 | * set up through-local-APIC on the BP's LINT0. This is not |
950 | * strictly necessery in pure symmetric-IO mode, but sometimes | 950 | * strictly necessary in pure symmetric-IO mode, but sometimes |
951 | * we delegate interrupts to the 8259A. | 951 | * we delegate interrupts to the 8259A. |
952 | */ | 952 | */ |
953 | /* | 953 | /* |
@@ -998,7 +998,7 @@ void __devinit setup_local_APIC(void) | |||
998 | } else { | 998 | } else { |
999 | if (esr_disable) | 999 | if (esr_disable) |
1000 | /* | 1000 | /* |
1001 | * Something untraceble is creating bad interrupts on | 1001 | * Something untraceable is creating bad interrupts on |
1002 | * secondary quads ... for the moment, just leave the | 1002 | * secondary quads ... for the moment, just leave the |
1003 | * ESR disabled - we can't do anything useful with the | 1003 | * ESR disabled - we can't do anything useful with the |
1004 | * errors anyway - mbligh | 1004 | * errors anyway - mbligh |
diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c index 32f2365c26ed..17089a041028 100644 --- a/arch/x86/kernel/apm_32.c +++ b/arch/x86/kernel/apm_32.c | |||
@@ -57,7 +57,7 @@ | |||
57 | * screen-blanking and gpm (Stephen Rothwell); Linux 1.99.4 | 57 | * screen-blanking and gpm (Stephen Rothwell); Linux 1.99.4 |
58 | * 1.2a:Simple change to stop mysterious bug reports with SMP also added | 58 | * 1.2a:Simple change to stop mysterious bug reports with SMP also added |
59 | * levels to the printk calls. APM is not defined for SMP machines. | 59 | * levels to the printk calls. APM is not defined for SMP machines. |
60 | * The new replacment for it is, but Linux doesn't yet support this. | 60 | * The new replacement for it is, but Linux doesn't yet support this. |
61 | * Alan Cox Linux 2.1.55 | 61 | * Alan Cox Linux 2.1.55 |
62 | * 1.3: Set up a valid data descriptor 0x40 for buggy BIOS's | 62 | * 1.3: Set up a valid data descriptor 0x40 for buggy BIOS's |
63 | * 1.4: Upgraded to support APM 1.2. Integrated ThinkPad suspend patch by | 63 | * 1.4: Upgraded to support APM 1.2. Integrated ThinkPad suspend patch by |
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 |
diff --git a/arch/x86/kernel/e820_32.c b/arch/x86/kernel/e820_32.c index d58039e8de74..58fd54eb5577 100644 --- a/arch/x86/kernel/e820_32.c +++ b/arch/x86/kernel/e820_32.c | |||
@@ -706,7 +706,7 @@ void __init e820_register_memory(void) | |||
706 | int i; | 706 | int i; |
707 | 707 | ||
708 | /* | 708 | /* |
709 | * Search for the bigest gap in the low 32 bits of the e820 | 709 | * Search for the biggest gap in the low 32 bits of the e820 |
710 | * memory space. | 710 | * memory space. |
711 | */ | 711 | */ |
712 | last = 0x100000000ull; | 712 | last = 0x100000000ull; |
diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c index 22d8f00c80dc..53303f2e5475 100644 --- a/arch/x86/kernel/hpet.c +++ b/arch/x86/kernel/hpet.c | |||
@@ -353,7 +353,7 @@ static int hpet_clocksource_register(void) | |||
353 | * | 353 | * |
354 | * hpet period is in femto seconds per cycle | 354 | * hpet period is in femto seconds per cycle |
355 | * so we need to convert this to ns/cyc units | 355 | * so we need to convert this to ns/cyc units |
356 | * aproximated by mult/2^shift | 356 | * approximated by mult/2^shift |
357 | * | 357 | * |
358 | * fsec/cyc * 1nsec/1000000fsec = nsec/cyc = mult/2^shift | 358 | * fsec/cyc * 1nsec/1000000fsec = nsec/cyc = mult/2^shift |
359 | * fsec/cyc * 1ns/1000000fsec * 2^shift = mult | 359 | * fsec/cyc * 1ns/1000000fsec * 2^shift = mult |
diff --git a/arch/x86/kernel/i8253.c b/arch/x86/kernel/i8253.c index 5cc8841ca2c6..a42c80745325 100644 --- a/arch/x86/kernel/i8253.c +++ b/arch/x86/kernel/i8253.c | |||
@@ -86,7 +86,7 @@ static int pit_next_event(unsigned long delta, struct clock_event_device *evt) | |||
86 | * On UP the PIT can serve all of the possible timer functions. On SMP systems | 86 | * On UP the PIT can serve all of the possible timer functions. On SMP systems |
87 | * it can be solely used for the global tick. | 87 | * it can be solely used for the global tick. |
88 | * | 88 | * |
89 | * The profiling and update capabilites are switched off once the local apic is | 89 | * The profiling and update capabilities are switched off once the local apic is |
90 | * registered. This mechanism replaces the previous #ifdef LOCAL_APIC - | 90 | * registered. This mechanism replaces the previous #ifdef LOCAL_APIC - |
91 | * !using_apic_timer decisions in do_timer_interrupt_hook() | 91 | * !using_apic_timer decisions in do_timer_interrupt_hook() |
92 | */ | 92 | */ |
diff --git a/arch/x86/kernel/io_apic_32.c b/arch/x86/kernel/io_apic_32.c index 0c55e9d86f69..f35c6eb33da9 100644 --- a/arch/x86/kernel/io_apic_32.c +++ b/arch/x86/kernel/io_apic_32.c | |||
@@ -584,7 +584,7 @@ tryanotherirq: | |||
584 | 584 | ||
585 | imbalance = move_this_load; | 585 | imbalance = move_this_load; |
586 | 586 | ||
587 | /* For physical_balance case, we accumlated both load | 587 | /* For physical_balance case, we accumulated both load |
588 | * values in the one of the siblings cpu_irq[], | 588 | * values in the one of the siblings cpu_irq[], |
589 | * to use the same code for physical and logical processors | 589 | * to use the same code for physical and logical processors |
590 | * as much as possible. | 590 | * as much as possible. |
@@ -2475,7 +2475,7 @@ void destroy_irq(unsigned int irq) | |||
2475 | } | 2475 | } |
2476 | 2476 | ||
2477 | /* | 2477 | /* |
2478 | * MSI mesage composition | 2478 | * MSI message composition |
2479 | */ | 2479 | */ |
2480 | #ifdef CONFIG_PCI_MSI | 2480 | #ifdef CONFIG_PCI_MSI |
2481 | static int msi_compose_msg(struct pci_dev *pdev, unsigned int irq, struct msi_msg *msg) | 2481 | static int msi_compose_msg(struct pci_dev *pdev, unsigned int irq, struct msi_msg *msg) |
diff --git a/arch/x86/kernel/io_apic_64.c b/arch/x86/kernel/io_apic_64.c index 1c2c7bf6a9d3..b3c2d268d708 100644 --- a/arch/x86/kernel/io_apic_64.c +++ b/arch/x86/kernel/io_apic_64.c | |||
@@ -1770,7 +1770,7 @@ __setup("no_timer_check", notimercheck); | |||
1770 | 1770 | ||
1771 | /* | 1771 | /* |
1772 | * | 1772 | * |
1773 | * IRQ's that are handled by the PIC in the MPS IOAPIC case. | 1773 | * IRQs that are handled by the PIC in the MPS IOAPIC case. |
1774 | * - IRQ2 is the cascade IRQ, and cannot be a io-apic IRQ. | 1774 | * - IRQ2 is the cascade IRQ, and cannot be a io-apic IRQ. |
1775 | * Linux doesn't really care, as it's not actually used | 1775 | * Linux doesn't really care, as it's not actually used |
1776 | * for any interrupt handling anyway. | 1776 | * for any interrupt handling anyway. |
@@ -1921,7 +1921,7 @@ void destroy_irq(unsigned int irq) | |||
1921 | } | 1921 | } |
1922 | 1922 | ||
1923 | /* | 1923 | /* |
1924 | * MSI mesage composition | 1924 | * MSI message composition |
1925 | */ | 1925 | */ |
1926 | #ifdef CONFIG_PCI_MSI | 1926 | #ifdef CONFIG_PCI_MSI |
1927 | static int msi_compose_msg(struct pci_dev *pdev, unsigned int irq, struct msi_msg *msg) | 1927 | static int msi_compose_msg(struct pci_dev *pdev, unsigned int irq, struct msi_msg *msg) |
diff --git a/arch/x86/kernel/mce_64.c b/arch/x86/kernel/mce_64.c index 2cf20de5beca..07bbfe7aa7f7 100644 --- a/arch/x86/kernel/mce_64.c +++ b/arch/x86/kernel/mce_64.c | |||
@@ -320,7 +320,7 @@ void do_machine_check(struct pt_regs * regs, long error_code) | |||
320 | #ifdef CONFIG_X86_MCE_INTEL | 320 | #ifdef CONFIG_X86_MCE_INTEL |
321 | /*** | 321 | /*** |
322 | * mce_log_therm_throt_event - Logs the thermal throttling event to mcelog | 322 | * mce_log_therm_throt_event - Logs the thermal throttling event to mcelog |
323 | * @cpu: The CPU on which the event occured. | 323 | * @cpu: The CPU on which the event occurred. |
324 | * @status: Event status information | 324 | * @status: Event status information |
325 | * | 325 | * |
326 | * This function should be called by the thermal interrupt after the | 326 | * This function should be called by the thermal interrupt after the |
@@ -688,7 +688,7 @@ static int __init mcheck_disable(char *str) | |||
688 | return 1; | 688 | return 1; |
689 | } | 689 | } |
690 | 690 | ||
691 | /* mce=off disables machine check. Note you can reenable it later | 691 | /* mce=off disables machine check. Note you can re-enable it later |
692 | using sysfs. | 692 | using sysfs. |
693 | mce=TOLERANCELEVEL (number, see above) | 693 | mce=TOLERANCELEVEL (number, see above) |
694 | mce=bootlog Log MCEs from before booting. Disabled by default on AMD. | 694 | mce=bootlog Log MCEs from before booting. Disabled by default on AMD. |
diff --git a/arch/x86/kernel/mpparse_32.c b/arch/x86/kernel/mpparse_32.c index 13abb4ebfb79..7a05a7f6099a 100644 --- a/arch/x86/kernel/mpparse_32.c +++ b/arch/x86/kernel/mpparse_32.c | |||
@@ -1001,7 +1001,7 @@ void __init mp_config_acpi_legacy_irqs (void) | |||
1001 | 1001 | ||
1002 | /* | 1002 | /* |
1003 | * Use the default configuration for the IRQs 0-15. Unless | 1003 | * Use the default configuration for the IRQs 0-15. Unless |
1004 | * overriden by (MADT) interrupt source override entries. | 1004 | * overridden by (MADT) interrupt source override entries. |
1005 | */ | 1005 | */ |
1006 | for (i = 0; i < 16; i++) { | 1006 | for (i = 0; i < 16; i++) { |
1007 | int idx; | 1007 | int idx; |
diff --git a/arch/x86/kernel/ptrace_32.c b/arch/x86/kernel/ptrace_32.c index 99102ec5fade..ff5431cc03ee 100644 --- a/arch/x86/kernel/ptrace_32.c +++ b/arch/x86/kernel/ptrace_32.c | |||
@@ -632,7 +632,7 @@ void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs, int error_code) | |||
632 | /* User-mode eip? */ | 632 | /* User-mode eip? */ |
633 | info.si_addr = user_mode_vm(regs) ? (void __user *) regs->eip : NULL; | 633 | info.si_addr = user_mode_vm(regs) ? (void __user *) regs->eip : NULL; |
634 | 634 | ||
635 | /* Send us the fakey SIGTRAP */ | 635 | /* Send us the fake SIGTRAP */ |
636 | force_sig_info(SIGTRAP, &info, tsk); | 636 | force_sig_info(SIGTRAP, &info, tsk); |
637 | } | 637 | } |
638 | 638 | ||
diff --git a/arch/x86/kernel/setup_32.c b/arch/x86/kernel/setup_32.c index e4f199124761..ba2e165a8a0f 100644 --- a/arch/x86/kernel/setup_32.c +++ b/arch/x86/kernel/setup_32.c | |||
@@ -624,7 +624,7 @@ void __init setup_arch(char **cmdline_p) | |||
624 | /* | 624 | /* |
625 | * NOTE: before this point _nobody_ is allowed to allocate | 625 | * NOTE: before this point _nobody_ is allowed to allocate |
626 | * any memory using the bootmem allocator. Although the | 626 | * any memory using the bootmem allocator. Although the |
627 | * alloctor is now initialised only the first 8Mb of the kernel | 627 | * allocator is now initialised only the first 8Mb of the kernel |
628 | * virtual address space has been mapped. All allocations before | 628 | * virtual address space has been mapped. All allocations before |
629 | * paging_init() has completed must use the alloc_bootmem_low_pages() | 629 | * paging_init() has completed must use the alloc_bootmem_low_pages() |
630 | * variant (which allocates DMA'able memory) and care must be taken | 630 | * variant (which allocates DMA'able memory) and care must be taken |
diff --git a/arch/x86/kernel/signal_32.c b/arch/x86/kernel/signal_32.c index 6dc394b87255..9bdd83022f5f 100644 --- a/arch/x86/kernel/signal_32.c +++ b/arch/x86/kernel/signal_32.c | |||
@@ -594,7 +594,7 @@ static void fastcall do_signal(struct pt_regs *regs) | |||
594 | 594 | ||
595 | signr = get_signal_to_deliver(&info, &ka, regs, NULL); | 595 | signr = get_signal_to_deliver(&info, &ka, regs, NULL); |
596 | if (signr > 0) { | 596 | if (signr > 0) { |
597 | /* Reenable any watchpoints before delivering the | 597 | /* Re-enable any watchpoints before delivering the |
598 | * signal to user space. The processor register will | 598 | * signal to user space. The processor register will |
599 | * have been cleared if the watchpoint triggered | 599 | * have been cleared if the watchpoint triggered |
600 | * inside the kernel. | 600 | * inside the kernel. |
diff --git a/arch/x86/kernel/signal_64.c b/arch/x86/kernel/signal_64.c index 683802bec419..ab086b0357fc 100644 --- a/arch/x86/kernel/signal_64.c +++ b/arch/x86/kernel/signal_64.c | |||
@@ -410,7 +410,7 @@ static void do_signal(struct pt_regs *regs) | |||
410 | 410 | ||
411 | signr = get_signal_to_deliver(&info, &ka, regs, NULL); | 411 | signr = get_signal_to_deliver(&info, &ka, regs, NULL); |
412 | if (signr > 0) { | 412 | if (signr > 0) { |
413 | /* Reenable any watchpoints before delivering the | 413 | /* Re-enable any watchpoints before delivering the |
414 | * signal to user space. The processor register will | 414 | * signal to user space. The processor register will |
415 | * have been cleared if the watchpoint triggered | 415 | * have been cleared if the watchpoint triggered |
416 | * inside the kernel. | 416 | * inside the kernel. |
diff --git a/arch/x86/kernel/smp_32.c b/arch/x86/kernel/smp_32.c index 2621ca3b2e4d..f32115308399 100644 --- a/arch/x86/kernel/smp_32.c +++ b/arch/x86/kernel/smp_32.c | |||
@@ -69,7 +69,7 @@ | |||
69 | * | 69 | * |
70 | * B stepping CPUs may hang. There are hardware work arounds | 70 | * B stepping CPUs may hang. There are hardware work arounds |
71 | * for this. We warn about it in case your board doesn't have the work | 71 | * for this. We warn about it in case your board doesn't have the work |
72 | * arounds. Basically thats so I can tell anyone with a B stepping | 72 | * arounds. Basically that's so I can tell anyone with a B stepping |
73 | * CPU and SMP problems "tough". | 73 | * CPU and SMP problems "tough". |
74 | * | 74 | * |
75 | * Specific items [From Pentium Processor Specification Update] | 75 | * Specific items [From Pentium Processor Specification Update] |
@@ -273,7 +273,7 @@ void leave_mm(unsigned long cpu) | |||
273 | * 1a1) cpu_clear(cpu, old_mm->cpu_vm_mask); | 273 | * 1a1) cpu_clear(cpu, old_mm->cpu_vm_mask); |
274 | * Stop ipi delivery for the old mm. This is not synchronized with | 274 | * Stop ipi delivery for the old mm. This is not synchronized with |
275 | * the other cpus, but smp_invalidate_interrupt ignore flush ipis | 275 | * the other cpus, but smp_invalidate_interrupt ignore flush ipis |
276 | * for the wrong mm, and in the worst case we perform a superflous | 276 | * for the wrong mm, and in the worst case we perform a superfluous |
277 | * tlb flush. | 277 | * tlb flush. |
278 | * 1a2) set cpu_tlbstate to TLBSTATE_OK | 278 | * 1a2) set cpu_tlbstate to TLBSTATE_OK |
279 | * Now the smp_invalidate_interrupt won't call leave_mm if cpu0 | 279 | * Now the smp_invalidate_interrupt won't call leave_mm if cpu0 |
diff --git a/arch/x86/kernel/smpboot_32.c b/arch/x86/kernel/smpboot_32.c index 7b8fdfa169dd..ef0f34ede1ab 100644 --- a/arch/x86/kernel/smpboot_32.c +++ b/arch/x86/kernel/smpboot_32.c | |||
@@ -421,7 +421,7 @@ static void __cpuinit start_secondary(void *unused) | |||
421 | /* | 421 | /* |
422 | * We need to hold call_lock, so there is no inconsistency | 422 | * We need to hold call_lock, so there is no inconsistency |
423 | * between the time smp_call_function() determines number of | 423 | * between the time smp_call_function() determines number of |
424 | * IPI receipients, and the time when the determination is made | 424 | * IPI recipients, and the time when the determination is made |
425 | * for which cpus receive the IPI. Holding this | 425 | * for which cpus receive the IPI. Holding this |
426 | * lock helps us to not include this cpu in a currently in progress | 426 | * lock helps us to not include this cpu in a currently in progress |
427 | * smp_call_function(). | 427 | * smp_call_function(). |
diff --git a/arch/x86/kernel/smpboot_64.c b/arch/x86/kernel/smpboot_64.c index fd1fff6a35a2..b7e768dd87c9 100644 --- a/arch/x86/kernel/smpboot_64.c +++ b/arch/x86/kernel/smpboot_64.c | |||
@@ -351,7 +351,7 @@ void __cpuinit start_secondary(void) | |||
351 | /* | 351 | /* |
352 | * We need to hold call_lock, so there is no inconsistency | 352 | * We need to hold call_lock, so there is no inconsistency |
353 | * between the time smp_call_function() determines number of | 353 | * between the time smp_call_function() determines number of |
354 | * IPI receipients, and the time when the determination is made | 354 | * IPI recipients, and the time when the determination is made |
355 | * for which cpus receive the IPI in genapic_flat.c. Holding this | 355 | * for which cpus receive the IPI in genapic_flat.c. Holding this |
356 | * lock helps us to not include this cpu in a currently in progress | 356 | * lock helps us to not include this cpu in a currently in progress |
357 | * smp_call_function(). | 357 | * smp_call_function(). |
diff --git a/arch/x86/kernel/summit_32.c b/arch/x86/kernel/summit_32.c index 91c7acc8d999..72f463401592 100644 --- a/arch/x86/kernel/summit_32.c +++ b/arch/x86/kernel/summit_32.c | |||
@@ -64,7 +64,7 @@ static int __init setup_pci_node_map_for_wpeg(int wpeg_num, int last_bus) | |||
64 | 64 | ||
65 | switch (rio_devs[wpeg_num]->type){ | 65 | switch (rio_devs[wpeg_num]->type){ |
66 | case CompatWPEG: | 66 | case CompatWPEG: |
67 | /* The Compatability Winnipeg controls the 2 legacy buses, | 67 | /* The Compatibility Winnipeg controls the 2 legacy buses, |
68 | * the 66MHz PCI bus [2 slots] and the 2 "extra" buses in case | 68 | * the 66MHz PCI bus [2 slots] and the 2 "extra" buses in case |
69 | * a PCI-PCI bridge card is used in either slot: total 5 buses. | 69 | * a PCI-PCI bridge card is used in either slot: total 5 buses. |
70 | */ | 70 | */ |
diff --git a/arch/x86/kernel/suspend_64.c b/arch/x86/kernel/suspend_64.c index 622bb0268284..bc9f59c246fd 100644 --- a/arch/x86/kernel/suspend_64.c +++ b/arch/x86/kernel/suspend_64.c | |||
@@ -124,7 +124,7 @@ void fix_processor_context(void) | |||
124 | int cpu = smp_processor_id(); | 124 | int cpu = smp_processor_id(); |
125 | struct tss_struct *t = &per_cpu(init_tss, cpu); | 125 | struct tss_struct *t = &per_cpu(init_tss, cpu); |
126 | 126 | ||
127 | set_tss_desc(cpu,t); /* This just modifies memory; should not be neccessary. But... This is neccessary, because 386 hardware has concept of busy TSS or some similar stupidity. */ | 127 | set_tss_desc(cpu,t); /* This just modifies memory; should not be necessary. But... This is necessary, because 386 hardware has concept of busy TSS or some similar stupidity. */ |
128 | 128 | ||
129 | cpu_gdt(cpu)[GDT_ENTRY_TSS].type = 9; | 129 | cpu_gdt(cpu)[GDT_ENTRY_TSS].type = 9; |
130 | 130 | ||
diff --git a/arch/x86/kernel/traps_64.c b/arch/x86/kernel/traps_64.c index df690c3fa458..d0c2bc7ab2ec 100644 --- a/arch/x86/kernel/traps_64.c +++ b/arch/x86/kernel/traps_64.c | |||
@@ -201,7 +201,7 @@ static unsigned long *in_exception_stack(unsigned cpu, unsigned long stack, | |||
201 | #define MSG(txt) ops->warning(data, txt) | 201 | #define MSG(txt) ops->warning(data, txt) |
202 | 202 | ||
203 | /* | 203 | /* |
204 | * x86-64 can have upto three kernel stacks: | 204 | * x86-64 can have up to three kernel stacks: |
205 | * process stack | 205 | * process stack |
206 | * interrupt stack | 206 | * interrupt stack |
207 | * severe exception (double fault, nmi, stack fault, debug, mce) hardware stack | 207 | * severe exception (double fault, nmi, stack fault, debug, mce) hardware stack |
diff --git a/arch/x86/kernel/tsc_32.c b/arch/x86/kernel/tsc_32.c index b8a7cf671432..d78444c788a3 100644 --- a/arch/x86/kernel/tsc_32.c +++ b/arch/x86/kernel/tsc_32.c | |||
@@ -59,7 +59,7 @@ int check_tsc_unstable(void) | |||
59 | } | 59 | } |
60 | EXPORT_SYMBOL_GPL(check_tsc_unstable); | 60 | EXPORT_SYMBOL_GPL(check_tsc_unstable); |
61 | 61 | ||
62 | /* Accellerators for sched_clock() | 62 | /* Accelerators for sched_clock() |
63 | * convert from cycles(64bits) => nanoseconds (64bits) | 63 | * convert from cycles(64bits) => nanoseconds (64bits) |
64 | * basic equation: | 64 | * basic equation: |
65 | * ns = cycles / (freq / ns_per_sec) | 65 | * ns = cycles / (freq / ns_per_sec) |
@@ -74,7 +74,7 @@ EXPORT_SYMBOL_GPL(check_tsc_unstable); | |||
74 | * And since SC is a constant power of two, we can convert the div | 74 | * And since SC is a constant power of two, we can convert the div |
75 | * into a shift. | 75 | * into a shift. |
76 | * | 76 | * |
77 | * We can use khz divisor instead of mhz to keep a better percision, since | 77 | * We can use khz divisor instead of mhz to keep a better precision, since |
78 | * cyc2ns_scale is limited to 10^6 * 2^10, which fits in 32 bits. | 78 | * cyc2ns_scale is limited to 10^6 * 2^10, which fits in 32 bits. |
79 | * (mathieu.desnoyers@polymtl.ca) | 79 | * (mathieu.desnoyers@polymtl.ca) |
80 | * | 80 | * |
diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c index 78f2250963ae..ad4005c6d4a1 100644 --- a/arch/x86/kernel/vsyscall_64.c +++ b/arch/x86/kernel/vsyscall_64.c | |||
@@ -53,7 +53,7 @@ | |||
53 | /* | 53 | /* |
54 | * vsyscall_gtod_data contains data that is : | 54 | * vsyscall_gtod_data contains data that is : |
55 | * - readonly from vsyscalls | 55 | * - readonly from vsyscalls |
56 | * - writen by timer interrupt or systcl (/proc/sys/kernel/vsyscall64) | 56 | * - written by timer interrupt or systcl (/proc/sys/kernel/vsyscall64) |
57 | * Try to keep this structure as small as possible to avoid cache line ping pongs | 57 | * Try to keep this structure as small as possible to avoid cache line ping pongs |
58 | */ | 58 | */ |
59 | int __vgetcpu_mode __section_vgetcpu_mode; | 59 | int __vgetcpu_mode __section_vgetcpu_mode; |
diff --git a/arch/x86/mach-default/setup.c b/arch/x86/mach-default/setup.c index 3f08010f3517..0c28a071824c 100644 --- a/arch/x86/mach-default/setup.c +++ b/arch/x86/mach-default/setup.c | |||
@@ -108,7 +108,7 @@ void __init time_init_hook(void) | |||
108 | * mca_nmi_hook - hook into MCA specific NMI chain | 108 | * mca_nmi_hook - hook into MCA specific NMI chain |
109 | * | 109 | * |
110 | * Description: | 110 | * Description: |
111 | * The MCA (Microchannel Arcitecture) has an NMI chain for NMI sources | 111 | * The MCA (Microchannel Architecture) has an NMI chain for NMI sources |
112 | * along the MCA bus. Use this to hook into that chain if you will need | 112 | * along the MCA bus. Use this to hook into that chain if you will need |
113 | * it. | 113 | * it. |
114 | **/ | 114 | **/ |
@@ -131,7 +131,7 @@ static __init int no_ipi_broadcast(char *str) | |||
131 | return 1; | 131 | return 1; |
132 | } | 132 | } |
133 | 133 | ||
134 | __setup("no_ipi_broadcast", no_ipi_broadcast); | 134 | __setup("no_ipi_broadcast=", no_ipi_broadcast); |
135 | 135 | ||
136 | static int __init print_ipi_mode(void) | 136 | static int __init print_ipi_mode(void) |
137 | { | 137 | { |
diff --git a/arch/x86/mach-generic/default.c b/arch/x86/mach-generic/default.c index 8685208d8512..1af0cc7648f0 100644 --- a/arch/x86/mach-generic/default.c +++ b/arch/x86/mach-generic/default.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Default generic APIC driver. This handles upto 8 CPUs. | 2 | * Default generic APIC driver. This handles up to 8 CPUs. |
3 | */ | 3 | */ |
4 | #define APIC_DEFINITION 1 | 4 | #define APIC_DEFINITION 1 |
5 | #include <linux/threads.h> | 5 | #include <linux/threads.h> |
diff --git a/arch/x86/mach-generic/probe.c b/arch/x86/mach-generic/probe.c index 4121d1551800..f410d3cb5659 100644 --- a/arch/x86/mach-generic/probe.c +++ b/arch/x86/mach-generic/probe.c | |||
@@ -56,7 +56,7 @@ void __init generic_bigsmp_probe(void) | |||
56 | /* | 56 | /* |
57 | * This routine is used to switch to bigsmp mode when | 57 | * This routine is used to switch to bigsmp mode when |
58 | * - There is no apic= option specified by the user | 58 | * - There is no apic= option specified by the user |
59 | * - generic_apic_probe() has choosen apic_default as the sub_arch | 59 | * - generic_apic_probe() has chosen apic_default as the sub_arch |
60 | * - we find more than 8 CPUs in acpi LAPIC listing with xAPIC support | 60 | * - we find more than 8 CPUs in acpi LAPIC listing with xAPIC support |
61 | */ | 61 | */ |
62 | 62 | ||
diff --git a/arch/x86/mach-voyager/voyager_smp.c b/arch/x86/mach-voyager/voyager_smp.c index f93a730b44d0..361ac5107b33 100644 --- a/arch/x86/mach-voyager/voyager_smp.c +++ b/arch/x86/mach-voyager/voyager_smp.c | |||
@@ -389,7 +389,7 @@ find_smp_config(void) | |||
389 | 389 | ||
390 | /* The boot CPU must be extended */ | 390 | /* The boot CPU must be extended */ |
391 | voyager_extended_vic_processors = 1<<boot_cpu_id; | 391 | voyager_extended_vic_processors = 1<<boot_cpu_id; |
392 | /* initially, all of the first 8 cpu's can boot */ | 392 | /* initially, all of the first 8 CPUs can boot */ |
393 | voyager_allowed_boot_processors = 0xff; | 393 | voyager_allowed_boot_processors = 0xff; |
394 | /* set up everything for just this CPU, we can alter | 394 | /* set up everything for just this CPU, we can alter |
395 | * this as we start the other CPUs later */ | 395 | * this as we start the other CPUs later */ |
@@ -1010,7 +1010,7 @@ static struct call_data_struct * call_data; | |||
1010 | 1010 | ||
1011 | /* execute a thread on a new CPU. The function to be called must be | 1011 | /* execute a thread on a new CPU. The function to be called must be |
1012 | * previously set up. This is used to schedule a function for | 1012 | * previously set up. This is used to schedule a function for |
1013 | * execution on all CPU's - set up the function then broadcast a | 1013 | * execution on all CPUs - set up the function then broadcast a |
1014 | * function_interrupt CPI to come here on each CPU */ | 1014 | * function_interrupt CPI to come here on each CPU */ |
1015 | static void | 1015 | static void |
1016 | smp_call_function_interrupt(void) | 1016 | smp_call_function_interrupt(void) |
@@ -1095,7 +1095,7 @@ voyager_smp_call_function_mask (cpumask_t cpumask, | |||
1095 | * CPI here. We don't use this actually for counting so losing | 1095 | * CPI here. We don't use this actually for counting so losing |
1096 | * ticks doesn't matter | 1096 | * ticks doesn't matter |
1097 | * | 1097 | * |
1098 | * FIXME: For those CPU's which actually have a local APIC, we could | 1098 | * FIXME: For those CPUs which actually have a local APIC, we could |
1099 | * try to use it to trigger this interrupt instead of having to | 1099 | * try to use it to trigger this interrupt instead of having to |
1100 | * broadcast the timer tick. Unfortunately, all my pentium DYADs have | 1100 | * broadcast the timer tick. Unfortunately, all my pentium DYADs have |
1101 | * no local APIC, so I can't do this | 1101 | * no local APIC, so I can't do this |
@@ -1287,7 +1287,7 @@ smp_local_timer_interrupt(void) | |||
1287 | 1287 | ||
1288 | /* | 1288 | /* |
1289 | * We take the 'long' return path, and there every subsystem | 1289 | * We take the 'long' return path, and there every subsystem |
1290 | * grabs the apropriate locks (kernel lock/ irq lock). | 1290 | * grabs the appropriate locks (kernel lock/ irq lock). |
1291 | * | 1291 | * |
1292 | * we might want to decouple profiling from the 'long path', | 1292 | * we might want to decouple profiling from the 'long path', |
1293 | * and do the profiling totally in assembly. | 1293 | * and do the profiling totally in assembly. |
@@ -1759,7 +1759,7 @@ set_vic_irq_affinity(unsigned int irq, cpumask_t mask) | |||
1759 | real_mask = cpus_addr(mask)[0] & voyager_extended_vic_processors; | 1759 | real_mask = cpus_addr(mask)[0] & voyager_extended_vic_processors; |
1760 | 1760 | ||
1761 | if(cpus_addr(mask)[0] == 0) | 1761 | if(cpus_addr(mask)[0] == 0) |
1762 | /* can't have no cpu's to accept the interrupt -- extremely | 1762 | /* can't have no CPUs to accept the interrupt -- extremely |
1763 | * bad things will happen */ | 1763 | * bad things will happen */ |
1764 | return; | 1764 | return; |
1765 | 1765 | ||
@@ -1791,7 +1791,7 @@ set_vic_irq_affinity(unsigned int irq, cpumask_t mask) | |||
1791 | } | 1791 | } |
1792 | /* this is magic, we now have the correct affinity maps, so | 1792 | /* this is magic, we now have the correct affinity maps, so |
1793 | * enable the interrupt. This will send an enable CPI to | 1793 | * enable the interrupt. This will send an enable CPI to |
1794 | * those cpu's who need to enable it in their local masks, | 1794 | * those CPUs who need to enable it in their local masks, |
1795 | * causing them to correct for the new affinity . If the | 1795 | * causing them to correct for the new affinity . If the |
1796 | * interrupt is currently globally disabled, it will simply be | 1796 | * interrupt is currently globally disabled, it will simply be |
1797 | * disabled again as it comes in (voyager lazy disable). If | 1797 | * disabled again as it comes in (voyager lazy disable). If |
diff --git a/arch/x86/mach-voyager/voyager_thread.c b/arch/x86/mach-voyager/voyager_thread.c index f9d595338159..50f9366c411e 100644 --- a/arch/x86/mach-voyager/voyager_thread.c +++ b/arch/x86/mach-voyager/voyager_thread.c | |||
@@ -64,7 +64,7 @@ check_from_kernel(void) | |||
64 | { | 64 | { |
65 | if(voyager_status.switch_off) { | 65 | if(voyager_status.switch_off) { |
66 | 66 | ||
67 | /* FIXME: This should be configureable via proc */ | 67 | /* FIXME: This should be configurable via proc */ |
68 | execute("umask 600; echo 0 > /etc/initrunlvl; kill -HUP 1"); | 68 | execute("umask 600; echo 0 > /etc/initrunlvl; kill -HUP 1"); |
69 | } else if(voyager_status.power_fail) { | 69 | } else if(voyager_status.power_fail) { |
70 | VDEBUG(("Voyager daemon detected AC power failure\n")); | 70 | VDEBUG(("Voyager daemon detected AC power failure\n")); |
diff --git a/arch/x86/mm/boot_ioremap_32.c b/arch/x86/mm/boot_ioremap_32.c index 4de95a17a7d4..f14da2a53ece 100644 --- a/arch/x86/mm/boot_ioremap_32.c +++ b/arch/x86/mm/boot_ioremap_32.c | |||
@@ -10,7 +10,7 @@ | |||
10 | 10 | ||
11 | /* | 11 | /* |
12 | * We need to use the 2-level pagetable functions, but CONFIG_X86_PAE | 12 | * We need to use the 2-level pagetable functions, but CONFIG_X86_PAE |
13 | * keeps that from happenning. If anyone has a better way, I'm listening. | 13 | * keeps that from happening. If anyone has a better way, I'm listening. |
14 | * | 14 | * |
15 | * boot_pte_t is defined only if this all works correctly | 15 | * boot_pte_t is defined only if this all works correctly |
16 | */ | 16 | */ |
diff --git a/arch/x86/mm/discontig_32.c b/arch/x86/mm/discontig_32.c index 13893772cc48..fe608a45ffb6 100644 --- a/arch/x86/mm/discontig_32.c +++ b/arch/x86/mm/discontig_32.c | |||
@@ -273,7 +273,7 @@ unsigned long __init setup_memory(void) | |||
273 | * When mapping a NUMA machine we allocate the node_mem_map arrays | 273 | * When mapping a NUMA machine we allocate the node_mem_map arrays |
274 | * from node local memory. They are then mapped directly into KVA | 274 | * from node local memory. They are then mapped directly into KVA |
275 | * between zone normal and vmalloc space. Calculate the size of | 275 | * between zone normal and vmalloc space. Calculate the size of |
276 | * this space and use it to adjust the boundry between ZONE_NORMAL | 276 | * this space and use it to adjust the boundary between ZONE_NORMAL |
277 | * and ZONE_HIGHMEM. | 277 | * and ZONE_HIGHMEM. |
278 | */ | 278 | */ |
279 | find_max_pfn(); | 279 | find_max_pfn(); |
diff --git a/arch/x86/mm/fault_32.c b/arch/x86/mm/fault_32.c index b695d70e998c..503dfc05111b 100644 --- a/arch/x86/mm/fault_32.c +++ b/arch/x86/mm/fault_32.c | |||
@@ -354,7 +354,7 @@ fastcall void __kprobes do_page_fault(struct pt_regs *regs, | |||
354 | 354 | ||
355 | /* When running in the kernel we expect faults to occur only to | 355 | /* When running in the kernel we expect faults to occur only to |
356 | * addresses in user space. All other faults represent errors in the | 356 | * addresses in user space. All other faults represent errors in the |
357 | * kernel and should generate an OOPS. Unfortunatly, in the case of an | 357 | * kernel and should generate an OOPS. Unfortunately, in the case of an |
358 | * erroneous fault occurring in a code path which already holds mmap_sem | 358 | * erroneous fault occurring in a code path which already holds mmap_sem |
359 | * we will deadlock attempting to validate the fault against the | 359 | * we will deadlock attempting to validate the fault against the |
360 | * address space. Luckily the kernel only validly references user | 360 | * address space. Luckily the kernel only validly references user |
@@ -362,7 +362,7 @@ fastcall void __kprobes do_page_fault(struct pt_regs *regs, | |||
362 | * exceptions table. | 362 | * exceptions table. |
363 | * | 363 | * |
364 | * As the vast majority of faults will be valid we will only perform | 364 | * As the vast majority of faults will be valid we will only perform |
365 | * the source reference check when there is a possibilty of a deadlock. | 365 | * the source reference check when there is a possibility of a deadlock. |
366 | * Attempt to lock the address space, if we cannot we then validate the | 366 | * Attempt to lock the address space, if we cannot we then validate the |
367 | * source. If this is invalid we can skip the address space check, | 367 | * source. If this is invalid we can skip the address space check, |
368 | * thus avoiding the deadlock. | 368 | * thus avoiding the deadlock. |
diff --git a/arch/x86/mm/fault_64.c b/arch/x86/mm/fault_64.c index 00be7f0a71b2..644b4f7ece10 100644 --- a/arch/x86/mm/fault_64.c +++ b/arch/x86/mm/fault_64.c | |||
@@ -373,7 +373,7 @@ asmlinkage void __kprobes do_page_fault(struct pt_regs *regs, | |||
373 | again: | 373 | again: |
374 | /* When running in the kernel we expect faults to occur only to | 374 | /* When running in the kernel we expect faults to occur only to |
375 | * addresses in user space. All other faults represent errors in the | 375 | * addresses in user space. All other faults represent errors in the |
376 | * kernel and should generate an OOPS. Unfortunatly, in the case of an | 376 | * kernel and should generate an OOPS. Unfortunately, in the case of an |
377 | * erroneous fault occurring in a code path which already holds mmap_sem | 377 | * erroneous fault occurring in a code path which already holds mmap_sem |
378 | * we will deadlock attempting to validate the fault against the | 378 | * we will deadlock attempting to validate the fault against the |
379 | * address space. Luckily the kernel only validly references user | 379 | * address space. Luckily the kernel only validly references user |
@@ -381,7 +381,7 @@ asmlinkage void __kprobes do_page_fault(struct pt_regs *regs, | |||
381 | * exceptions table. | 381 | * exceptions table. |
382 | * | 382 | * |
383 | * As the vast majority of faults will be valid we will only perform | 383 | * As the vast majority of faults will be valid we will only perform |
384 | * the source reference check when there is a possibilty of a deadlock. | 384 | * the source reference check when there is a possibility of a deadlock. |
385 | * Attempt to lock the address space, if we cannot we then validate the | 385 | * Attempt to lock the address space, if we cannot we then validate the |
386 | * source. If this is invalid we can skip the address space check, | 386 | * source. If this is invalid we can skip the address space check, |
387 | * thus avoiding the deadlock. | 387 | * thus avoiding the deadlock. |
diff --git a/arch/x86/mm/srat_64.c b/arch/x86/mm/srat_64.c index 56089ccc3949..ea85172fc0cc 100644 --- a/arch/x86/mm/srat_64.c +++ b/arch/x86/mm/srat_64.c | |||
@@ -218,7 +218,7 @@ static inline int save_add_info(void) {return 0;} | |||
218 | /* | 218 | /* |
219 | * Update nodes_add and decide if to include add are in the zone. | 219 | * Update nodes_add and decide if to include add are in the zone. |
220 | * Both SPARSE and RESERVE need nodes_add infomation. | 220 | * Both SPARSE and RESERVE need nodes_add infomation. |
221 | * This code supports one contigious hot add area per node. | 221 | * This code supports one contiguous hot add area per node. |
222 | */ | 222 | */ |
223 | static int reserve_hotadd(int node, unsigned long start, unsigned long end) | 223 | static int reserve_hotadd(int node, unsigned long start, unsigned long end) |
224 | { | 224 | { |
diff --git a/arch/x86/oprofile/op_x86_model.h b/arch/x86/oprofile/op_x86_model.h index abb1aa95b979..45b605fa71d0 100644 --- a/arch/x86/oprofile/op_x86_model.h +++ b/arch/x86/oprofile/op_x86_model.h | |||
@@ -29,7 +29,7 @@ struct op_msrs { | |||
29 | struct pt_regs; | 29 | struct pt_regs; |
30 | 30 | ||
31 | /* The model vtable abstracts the differences between | 31 | /* The model vtable abstracts the differences between |
32 | * various x86 CPU model's perfctr support. | 32 | * various x86 CPU models' perfctr support. |
33 | */ | 33 | */ |
34 | struct op_x86_model_spec { | 34 | struct op_x86_model_spec { |
35 | unsigned int const num_counters; | 35 | unsigned int const num_counters; |
diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c index c52150fdf82b..88d8f5c0ecb5 100644 --- a/arch/x86/pci/irq.c +++ b/arch/x86/pci/irq.c | |||
@@ -169,7 +169,7 @@ void eisa_set_level_irq(unsigned int irq) | |||
169 | } | 169 | } |
170 | 170 | ||
171 | /* | 171 | /* |
172 | * Common IRQ routing practice: nybbles in config space, | 172 | * Common IRQ routing practice: nibbles in config space, |
173 | * offset by some magic constant. | 173 | * offset by some magic constant. |
174 | */ | 174 | */ |
175 | static unsigned int read_config_nybble(struct pci_dev *router, unsigned offset, unsigned nr) | 175 | static unsigned int read_config_nybble(struct pci_dev *router, unsigned offset, unsigned nr) |
@@ -585,7 +585,7 @@ static __init int via_router_probe(struct irq_router *r, | |||
585 | /* FIXME: We should move some of the quirk fixup stuff here */ | 585 | /* FIXME: We should move some of the quirk fixup stuff here */ |
586 | 586 | ||
587 | /* | 587 | /* |
588 | * work arounds for some buggy BIOSes | 588 | * workarounds for some buggy BIOSes |
589 | */ | 589 | */ |
590 | if (device == PCI_DEVICE_ID_VIA_82C586_0) { | 590 | if (device == PCI_DEVICE_ID_VIA_82C586_0) { |
591 | switch(router->device) { | 591 | switch(router->device) { |