From 87cf5e99dc2cbde857f1036f1d00dccad0b5da10 Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Wed, 30 Jan 2008 13:31:42 +0100 Subject: [PATCH] --- yaml --- r: 80049 b: refs/heads/master c: ab4a574ef23cfa801a5078f7d7c2f2b76ecd6d91 h: refs/heads/master i: 80047: 0666626af1496de3279a1abcb0173cc1a32bddde v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/apic_32.c | 2 +- trunk/arch/x86/kernel/mpparse_32.c | 2 +- trunk/arch/x86/kernel/vm86_32.c | 2 +- trunk/arch/x86/mm/srat_64.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index aed13db979a3..31f42512e84f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 85f2adf16955460c98131360f3d76aeb51aba073 +refs/heads/master: ab4a574ef23cfa801a5078f7d7c2f2b76ecd6d91 diff --git a/trunk/arch/x86/kernel/apic_32.c b/trunk/arch/x86/kernel/apic_32.c index 4c014fca2057..4330a899ddcb 100644 --- a/trunk/arch/x86/kernel/apic_32.c +++ b/trunk/arch/x86/kernel/apic_32.c @@ -108,7 +108,7 @@ static inline int lapic_get_version(void) } /* - * Check, if the APIC is integrated or a seperate chip + * Check, if the APIC is integrated or a separate chip */ static inline int lapic_is_integrated(void) { diff --git a/trunk/arch/x86/kernel/mpparse_32.c b/trunk/arch/x86/kernel/mpparse_32.c index bfcfc41f5607..a4c05372626b 100644 --- a/trunk/arch/x86/kernel/mpparse_32.c +++ b/trunk/arch/x86/kernel/mpparse_32.c @@ -1050,7 +1050,7 @@ int mp_register_gsi(u32 gsi, int triggering, int polarity) int idx, bit = 0; static int pci_irq = IRQ_COMPRESSION_START; /* - * Mapping between Global System Interrups, which + * Mapping between Global System Interrupts, which * represent all possible interrupts, and IRQs * assigned to actual devices. */ diff --git a/trunk/arch/x86/kernel/vm86_32.c b/trunk/arch/x86/kernel/vm86_32.c index c9f67effbc42..738c2104df30 100644 --- a/trunk/arch/x86/kernel/vm86_32.c +++ b/trunk/arch/x86/kernel/vm86_32.c @@ -384,7 +384,7 @@ static inline void clear_AC(struct kernel_vm86_regs * regs) * functions. However someone forgot to call clear_IF(regs) * in the opposite case. * After the command sequence CLI PUSHF STI POPF you should - * end up with interrups disabled, but you ended up with + * end up with interrupts disabled, but you ended up with * interrupts enabled. * ( I was testing my own changes, but the only bug I * could find was in a function I had not changed. ) diff --git a/trunk/arch/x86/mm/srat_64.c b/trunk/arch/x86/mm/srat_64.c index 9be14171144b..5c0637e4c2f4 100644 --- a/trunk/arch/x86/mm/srat_64.c +++ b/trunk/arch/x86/mm/srat_64.c @@ -160,7 +160,7 @@ static inline int save_add_info(void) {return 0;} #endif /* * Update nodes_add and decide if to include add are in the zone. - * Both SPARSE and RESERVE need nodes_add infomation. + * Both SPARSE and RESERVE need nodes_add information. * This code supports one contiguous hot add area per node. */ static int reserve_hotadd(int node, unsigned long start, unsigned long end)