diff options
| author |   Dave Jones <davej@redhat.com> | 2006-03-25 16:30:16 +0100 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-25 09:10:54 -0800 |
| commit | e6fc99c6aba0350a3c4c0206b7047d4893491485 (patch) | |
| tree | 98e18080a519183356637799112757e37fb1b3de | |
| parent | [PATCH] x86_64: Move kernel to 2MB (diff) | |
| download | linux-dev-e6fc99c6aba0350a3c4c0206b7047d4893491485.tar.xz linux-dev-e6fc99c6aba0350a3c4c0206b7047d4893491485.zip | |
[PATCH] x86_64: s/Overwrite/Override/ in arch/x86-64
s/Overwrite/Override/
Signed-off-by: Dave Jones <davej@redhat.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -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; #define USE_ELF_CORE_DUMP 1 -/* Overwrite elfcore.h */ +/* Override elfcore.h */ #define _LINUX_ELFCORE_H 1 typedef unsigned int elf_greg_t; 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) force_iommu) && !iommu_aperture_allowed) { printk(KERN_INFO - "Looks like a VIA chipset. Disabling IOMMU. Overwrite with \"iommu=allowed\"\n"); + "Looks like a VIA chipset. Disabling IOMMU. Override with \"iommu=allowed\"\n"); iommu_aperture_disabled = 1; } #endif |