diff options
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/include/asm/desc_defs.h | 4 | ||||
-rw-r--r-- | arch/x86/include/asm/mmzone_32.h | 2 | ||||
-rw-r--r-- | arch/x86/include/asm/uv/uv_bau.h | 2 | ||||
-rw-r--r-- | arch/x86/kernel/acpi/boot.c | 2 | ||||
-rw-r--r-- | arch/x86/kernel/amd_iommu.c | 4 | ||||
-rw-r--r-- | arch/x86/kernel/cpu/perf_event.c | 2 | ||||
-rw-r--r-- | arch/x86/kernel/kprobes.c | 4 | ||||
-rw-r--r-- | arch/x86/mm/kmmio.c | 4 |
8 files changed, 12 insertions, 12 deletions
diff --git a/arch/x86/include/asm/desc_defs.h b/arch/x86/include/asm/desc_defs.h index 9d6684849fd9..278441f39856 100644 --- a/arch/x86/include/asm/desc_defs.h +++ b/arch/x86/include/asm/desc_defs.h | |||
@@ -12,9 +12,9 @@ | |||
12 | #include <linux/types.h> | 12 | #include <linux/types.h> |
13 | 13 | ||
14 | /* | 14 | /* |
15 | * FIXME: Acessing the desc_struct through its fields is more elegant, | 15 | * FIXME: Accessing the desc_struct through its fields is more elegant, |
16 | * and should be the one valid thing to do. However, a lot of open code | 16 | * and should be the one valid thing to do. However, a lot of open code |
17 | * still touches the a and b acessors, and doing this allow us to do it | 17 | * still touches the a and b accessors, and doing this allow us to do it |
18 | * incrementally. We keep the signature as a struct, rather than an union, | 18 | * incrementally. We keep the signature as a struct, rather than an union, |
19 | * so we can get rid of it transparently in the future -- glommer | 19 | * so we can get rid of it transparently in the future -- glommer |
20 | */ | 20 | */ |
diff --git a/arch/x86/include/asm/mmzone_32.h b/arch/x86/include/asm/mmzone_32.h index ede6998bd92c..91df7c51806c 100644 --- a/arch/x86/include/asm/mmzone_32.h +++ b/arch/x86/include/asm/mmzone_32.h | |||
@@ -47,7 +47,7 @@ static inline void resume_map_numa_kva(pgd_t *pgd) {} | |||
47 | /* | 47 | /* |
48 | * generic node memory support, the following assumptions apply: | 48 | * generic node memory support, the following assumptions apply: |
49 | * | 49 | * |
50 | * 1) memory comes in 64Mb contigious chunks which are either present or not | 50 | * 1) memory comes in 64Mb contiguous chunks which are either present or not |
51 | * 2) we will not have more than 64Gb in total | 51 | * 2) we will not have more than 64Gb in total |
52 | * | 52 | * |
53 | * for now assume that 64Gb is max amount of RAM for whole system | 53 | * for now assume that 64Gb is max amount of RAM for whole system |
diff --git a/arch/x86/include/asm/uv/uv_bau.h b/arch/x86/include/asm/uv/uv_bau.h index 80e2984f521c..b414d2b401f6 100644 --- a/arch/x86/include/asm/uv/uv_bau.h +++ b/arch/x86/include/asm/uv/uv_bau.h | |||
@@ -55,7 +55,7 @@ | |||
55 | #define DESC_STATUS_SOURCE_TIMEOUT 3 | 55 | #define DESC_STATUS_SOURCE_TIMEOUT 3 |
56 | 56 | ||
57 | /* | 57 | /* |
58 | * source side threshholds at which message retries print a warning | 58 | * source side thresholds at which message retries print a warning |
59 | */ | 59 | */ |
60 | #define SOURCE_TIMEOUT_LIMIT 20 | 60 | #define SOURCE_TIMEOUT_LIMIT 20 |
61 | #define DESTINATION_TIMEOUT_LIMIT 20 | 61 | #define DESTINATION_TIMEOUT_LIMIT 20 |
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index 67e929b89875..1c2c4838d35c 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c | |||
@@ -1122,7 +1122,7 @@ static int __init acpi_parse_madt_ioapic_entries(void) | |||
1122 | if (!acpi_sci_override_gsi) | 1122 | if (!acpi_sci_override_gsi) |
1123 | acpi_sci_ioapic_setup(acpi_gbl_FADT.sci_interrupt, 0, 0); | 1123 | acpi_sci_ioapic_setup(acpi_gbl_FADT.sci_interrupt, 0, 0); |
1124 | 1124 | ||
1125 | /* Fill in identity legacy mapings where no override */ | 1125 | /* Fill in identity legacy mappings where no override */ |
1126 | mp_config_acpi_legacy_irqs(); | 1126 | mp_config_acpi_legacy_irqs(); |
1127 | 1127 | ||
1128 | count = | 1128 | count = |
diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c index 0285521e0a99..42ac5e000995 100644 --- a/arch/x86/kernel/amd_iommu.c +++ b/arch/x86/kernel/amd_iommu.c | |||
@@ -1637,7 +1637,7 @@ retry: | |||
1637 | goto out; | 1637 | goto out; |
1638 | 1638 | ||
1639 | /* | 1639 | /* |
1640 | * aperture was sucessfully enlarged by 128 MB, try | 1640 | * aperture was successfully enlarged by 128 MB, try |
1641 | * allocation again | 1641 | * allocation again |
1642 | */ | 1642 | */ |
1643 | goto retry; | 1643 | goto retry; |
@@ -2396,7 +2396,7 @@ int __init amd_iommu_init_passthrough(void) | |||
2396 | struct pci_dev *dev = NULL; | 2396 | struct pci_dev *dev = NULL; |
2397 | u16 devid, devid2; | 2397 | u16 devid, devid2; |
2398 | 2398 | ||
2399 | /* allocate passthroug domain */ | 2399 | /* allocate passthrough domain */ |
2400 | pt_domain = protection_domain_alloc(); | 2400 | pt_domain = protection_domain_alloc(); |
2401 | if (!pt_domain) | 2401 | if (!pt_domain) |
2402 | return -ENOMEM; | 2402 | return -ENOMEM; |
diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c index b5801c311846..35be5802ac1e 100644 --- a/arch/x86/kernel/cpu/perf_event.c +++ b/arch/x86/kernel/cpu/perf_event.c | |||
@@ -1229,7 +1229,7 @@ x86_perf_event_set_period(struct perf_event *event, | |||
1229 | return 0; | 1229 | return 0; |
1230 | 1230 | ||
1231 | /* | 1231 | /* |
1232 | * If we are way outside a reasoable range then just skip forward: | 1232 | * If we are way outside a reasonable range then just skip forward: |
1233 | */ | 1233 | */ |
1234 | if (unlikely(left <= -period)) { | 1234 | if (unlikely(left <= -period)) { |
1235 | left = period; | 1235 | left = period; |
diff --git a/arch/x86/kernel/kprobes.c b/arch/x86/kernel/kprobes.c index 7b5169d2b000..7d377379fa4a 100644 --- a/arch/x86/kernel/kprobes.c +++ b/arch/x86/kernel/kprobes.c | |||
@@ -514,7 +514,7 @@ static int __kprobes reenter_kprobe(struct kprobe *p, struct pt_regs *regs, | |||
514 | 514 | ||
515 | /* | 515 | /* |
516 | * Interrupts are disabled on entry as trap3 is an interrupt gate and they | 516 | * Interrupts are disabled on entry as trap3 is an interrupt gate and they |
517 | * remain disabled thorough out this function. | 517 | * remain disabled throughout this function. |
518 | */ | 518 | */ |
519 | static int __kprobes kprobe_handler(struct pt_regs *regs) | 519 | static int __kprobes kprobe_handler(struct pt_regs *regs) |
520 | { | 520 | { |
@@ -851,7 +851,7 @@ no_change: | |||
851 | 851 | ||
852 | /* | 852 | /* |
853 | * Interrupts are disabled on entry as trap1 is an interrupt gate and they | 853 | * Interrupts are disabled on entry as trap1 is an interrupt gate and they |
854 | * remain disabled thoroughout this function. | 854 | * remain disabled throughout this function. |
855 | */ | 855 | */ |
856 | static int __kprobes post_kprobe_handler(struct pt_regs *regs) | 856 | static int __kprobes post_kprobe_handler(struct pt_regs *regs) |
857 | { | 857 | { |
diff --git a/arch/x86/mm/kmmio.c b/arch/x86/mm/kmmio.c index 16ccbd77917f..d16d576beebf 100644 --- a/arch/x86/mm/kmmio.c +++ b/arch/x86/mm/kmmio.c | |||
@@ -203,7 +203,7 @@ static void disarm_kmmio_fault_page(struct kmmio_fault_page *f) | |||
203 | */ | 203 | */ |
204 | /* | 204 | /* |
205 | * Interrupts are disabled on entry as trap3 is an interrupt gate | 205 | * Interrupts are disabled on entry as trap3 is an interrupt gate |
206 | * and they remain disabled thorough out this function. | 206 | * and they remain disabled throughout this function. |
207 | */ | 207 | */ |
208 | int kmmio_handler(struct pt_regs *regs, unsigned long addr) | 208 | int kmmio_handler(struct pt_regs *regs, unsigned long addr) |
209 | { | 209 | { |
@@ -302,7 +302,7 @@ no_kmmio: | |||
302 | 302 | ||
303 | /* | 303 | /* |
304 | * Interrupts are disabled on entry as trap1 is an interrupt gate | 304 | * Interrupts are disabled on entry as trap1 is an interrupt gate |
305 | * and they remain disabled thorough out this function. | 305 | * and they remain disabled throughout this function. |
306 | * This must always get called as the pair to kmmio_handler(). | 306 | * This must always get called as the pair to kmmio_handler(). |
307 | */ | 307 | */ |
308 | static int post_kmmio_handler(unsigned long condition, struct pt_regs *regs) | 308 | static int post_kmmio_handler(unsigned long condition, struct pt_regs *regs) |