aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r--arch/x86/kernel/acpi/boot.c2
-rw-r--r--arch/x86/kernel/amd_iommu.c4
-rw-r--r--arch/x86/kernel/cpu/perf_event.c2
-rw-r--r--arch/x86/kernel/kprobes.c4
4 files changed, 6 insertions, 6 deletions
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 */
519static int __kprobes kprobe_handler(struct pt_regs *regs) 519static 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 */
856static int __kprobes post_kprobe_handler(struct pt_regs *regs) 856static int __kprobes post_kprobe_handler(struct pt_regs *regs)
857{ 857{