diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86_64/ia32/ia32_binfmt.c | 2 | ||||
-rw-r--r-- | arch/x86_64/kernel/io_apic.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86_64/ia32/ia32_binfmt.c b/arch/x86_64/ia32/ia32_binfmt.c index 572b3b28772d..e776139afb20 100644 --- a/arch/x86_64/ia32/ia32_binfmt.c +++ b/arch/x86_64/ia32/ia32_binfmt.c | |||
@@ -58,7 +58,7 @@ struct elf_phdr; | |||
58 | 58 | ||
59 | #define USE_ELF_CORE_DUMP 1 | 59 | #define USE_ELF_CORE_DUMP 1 |
60 | 60 | ||
61 | /* Overwrite elfcore.h */ | 61 | /* Override elfcore.h */ |
62 | #define _LINUX_ELFCORE_H 1 | 62 | #define _LINUX_ELFCORE_H 1 |
63 | typedef unsigned int elf_greg_t; | 63 | typedef unsigned int elf_greg_t; |
64 | 64 | ||
diff --git a/arch/x86_64/kernel/io_apic.c b/arch/x86_64/kernel/io_apic.c index ffed464e6b12..f264d9dc97fe 100644 --- a/arch/x86_64/kernel/io_apic.c +++ b/arch/x86_64/kernel/io_apic.c | |||
@@ -310,7 +310,7 @@ void __init check_ioapic(void) | |||
310 | force_iommu) && | 310 | force_iommu) && |
311 | !iommu_aperture_allowed) { | 311 | !iommu_aperture_allowed) { |
312 | printk(KERN_INFO | 312 | printk(KERN_INFO |
313 | "Looks like a VIA chipset. Disabling IOMMU. Overwrite with \"iommu=allowed\"\n"); | 313 | "Looks like a VIA chipset. Disabling IOMMU. Override with \"iommu=allowed\"\n"); |
314 | iommu_aperture_disabled = 1; | 314 | iommu_aperture_disabled = 1; |
315 | } | 315 | } |
316 | #endif | 316 | #endif |