diff options
| author | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-07-31 22:31:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-07-31 22:31:26 -0700 |
| commit | d383ba51a478fbcaa37ab09af9bd8b1433028801 (patch) | |
| tree | 0380bd6c05e64f391a806ff1c97583e2dda084a5 /arch | |
| parent | 0e94855881664384004a6b310b1a80d528751c06 (diff) | |
| parent | bccdb12ca468f698fc7b61a00d1b8b225399c5e7 (diff) | |
Merge with Rusty 'trivial' Russell
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/i386/kernel/apic.c | 2 | ||||
| -rw-r--r-- | arch/i386/kernel/i386_ksyms.c | 1 | ||||
| -rw-r--r-- | arch/i386/kernel/io_apic.c | 4 | ||||
| -rw-r--r-- | arch/ia64/config.in | 8 | ||||
| -rw-r--r-- | arch/ppc/8260_io/Config.in | 2 |
5 files changed, 9 insertions, 8 deletions
diff --git a/arch/i386/kernel/apic.c b/arch/i386/kernel/apic.c index a864800e1f3c..be2f19bf4d03 100644 --- a/arch/i386/kernel/apic.c +++ b/arch/i386/kernel/apic.c @@ -1140,7 +1140,7 @@ asmlinkage void smp_error_interrupt(void) 6: Received illegal vector 7: Illegal register address */ - printk (KERN_ERR "APIC error on CPU%d: %02lx(%02lx)\n", + printk (KERN_INFO "APIC error on CPU%d: %02lx(%02lx)\n", smp_processor_id(), v , v1); irq_exit(); } diff --git a/arch/i386/kernel/i386_ksyms.c b/arch/i386/kernel/i386_ksyms.c index 2b6ba73e1fd9..d31b096b4da7 100644 --- a/arch/i386/kernel/i386_ksyms.c +++ b/arch/i386/kernel/i386_ksyms.c @@ -132,6 +132,7 @@ EXPORT_SYMBOL_NOVERS(__write_lock_failed); EXPORT_SYMBOL_NOVERS(__read_lock_failed); /* Global SMP stuff */ +EXPORT_SYMBOL(synchronize_irq); EXPORT_SYMBOL(smp_call_function); /* TLB flushing */ diff --git a/arch/i386/kernel/io_apic.c b/arch/i386/kernel/io_apic.c index a2ca84337699..8944f668e984 100644 --- a/arch/i386/kernel/io_apic.c +++ b/arch/i386/kernel/io_apic.c @@ -791,7 +791,7 @@ void __init setup_ExtINT_IRQ0_pin(unsigned int pin, int vector) entry.vector = vector; /* - * The timer IRQ doesnt have to know that behind the + * The timer IRQ doesn't have to know that behind the * scene we have a 8259A-master in AEOI mode ... */ irq_desc[0].handler = &ioapic_edge_irq_type; @@ -1654,7 +1654,7 @@ static inline void check_timer(void) printk(" failed.\n"); if (nmi_watchdog) { - printk(KERN_WARNING "timer doesnt work through the IO-APIC - disabling NMI Watchdog!\n"); + printk(KERN_WARNING "timer doesn't work through the IO-APIC - disabling NMI Watchdog!\n"); nmi_watchdog = 0; } diff --git a/arch/ia64/config.in b/arch/ia64/config.in index e8b206238104..fc54b622b779 100644 --- a/arch/ia64/config.in +++ b/arch/ia64/config.in @@ -71,15 +71,15 @@ fi if [ "$CONFIG_IA64_SGI_SN1" = "y" -o "$CONFIG_IA64_SGI_SN2" = "y" ]; then define_bool CONFIG_IA64_SGI_SN y - bool ' Enable extra debugging code' CONFIG_IA64_SGI_SN_DEBUG n + bool ' Enable extra debugging code' CONFIG_IA64_SGI_SN_DEBUG bool ' Enable SGI Medusa Simulator Support' CONFIG_IA64_SGI_SN_SIM bool ' Enable autotest (llsc). Option to run cache test instead of booting' \ - CONFIG_IA64_SGI_AUTOTEST n + CONFIG_IA64_SGI_AUTOTEST define_bool CONFIG_DEVFS_FS y if [ "$CONFIG_DEVFS_FS" = "y" ]; then - bool ' Enable DEVFS Debug Code' CONFIG_DEVFS_DEBUG n + bool ' Enable DEVFS Debug Code' CONFIG_DEVFS_DEBUG fi - bool ' Enable protocol mode for the L1 console' CONFIG_SERIAL_SGI_L1_PROTOCOL y + bool ' Enable protocol mode for the L1 console' CONFIG_SERIAL_SGI_L1_PROTOCOL define_bool CONFIG_DISCONTIGMEM y define_bool CONFIG_IA64_MCA y define_bool CONFIG_NUMA y diff --git a/arch/ppc/8260_io/Config.in b/arch/ppc/8260_io/Config.in index 20eeaeae50fc..c47b35052cc6 100644 --- a/arch/ppc/8260_io/Config.in +++ b/arch/ppc/8260_io/Config.in @@ -26,7 +26,7 @@ if [ "$CONFIG_NET_ETHERNET" = "y" ]; then choice 'Type of PHY' \ "LXT970 CONFIG_FCC_LXT970 \ LXT971 CONFIG_FCC_LXT971 \ - QS6612 CONFIG_FCC_QS6612" CONFIG_FCC_LXT971 + QS6612 CONFIG_FCC_QS6612" LXT971 fi fi fi |