Commit 2e092a28 authored by James Bottomley's avatar James Bottomley

Remove last CONFIG_VISWS remnants from arch/i386/kernel

parent 2c2d007b
...@@ -51,6 +51,7 @@ ...@@ -51,6 +51,7 @@
#include <asm/smpboot.h> #include <asm/smpboot.h>
#include <asm/desc.h> #include <asm/desc.h>
#include <asm/arch_hooks.h> #include <asm/arch_hooks.h>
#include "smpboot_hooks.h"
/* Set if we find a B stepping CPU */ /* Set if we find a B stepping CPU */
static int __initdata smp_b_stepping; static int __initdata smp_b_stepping;
...@@ -1072,9 +1073,7 @@ void __init smp_boot_cpus(void) ...@@ -1072,9 +1073,7 @@ void __init smp_boot_cpus(void)
*/ */
if (!smp_found_config) { if (!smp_found_config) {
printk(KERN_NOTICE "SMP motherboard not detected.\n"); printk(KERN_NOTICE "SMP motherboard not detected.\n");
#ifndef CONFIG_VISWS smpboot_clear_io_apic_irqs();
io_apic_irqs = 0;
#endif
cpu_online_map = phys_cpu_present_map = 1; cpu_online_map = phys_cpu_present_map = 1;
if (APIC_init_uniprocessor()) if (APIC_init_uniprocessor())
printk(KERN_NOTICE "Local APIC not detected." printk(KERN_NOTICE "Local APIC not detected."
...@@ -1101,9 +1100,7 @@ void __init smp_boot_cpus(void) ...@@ -1101,9 +1100,7 @@ void __init smp_boot_cpus(void)
printk(KERN_ERR "BIOS bug, local APIC #%d not detected!...\n", printk(KERN_ERR "BIOS bug, local APIC #%d not detected!...\n",
boot_cpu_physical_apicid); boot_cpu_physical_apicid);
printk(KERN_ERR "... forcing use of dummy APIC emulation. (tell your hw vendor)\n"); printk(KERN_ERR "... forcing use of dummy APIC emulation. (tell your hw vendor)\n");
#ifndef CONFIG_VISWS smpboot_clear_io_apic_irqs();
io_apic_irqs = 0;
#endif
cpu_online_map = phys_cpu_present_map = 1; cpu_online_map = phys_cpu_present_map = 1;
goto smp_done; goto smp_done;
} }
...@@ -1116,9 +1113,7 @@ void __init smp_boot_cpus(void) ...@@ -1116,9 +1113,7 @@ void __init smp_boot_cpus(void)
if (!max_cpus) { if (!max_cpus) {
smp_found_config = 0; smp_found_config = 0;
printk(KERN_INFO "SMP mode deactivated, forcing use of dummy APIC emulation.\n"); printk(KERN_INFO "SMP mode deactivated, forcing use of dummy APIC emulation.\n");
#ifndef CONFIG_VISWS smpboot_clear_io_apic_irqs();
io_apic_irqs = 0;
#endif
cpu_online_map = phys_cpu_present_map = 1; cpu_online_map = phys_cpu_present_map = 1;
goto smp_done; goto smp_done;
} }
...@@ -1165,22 +1160,7 @@ void __init smp_boot_cpus(void) ...@@ -1165,22 +1160,7 @@ void __init smp_boot_cpus(void)
/* /*
* Cleanup possible dangling ends... * Cleanup possible dangling ends...
*/ */
#ifndef CONFIG_VISWS smpboot_setup_warm_reset_vector();
{
/*
* Install writable page 0 entry to set BIOS data area.
*/
local_flush_tlb();
/*
* Paranoid: Set warm reset code and vector here back
* to default values.
*/
CMOS_WRITE(0, 0xf);
*((volatile long *) phys_to_virt(0x467)) = 0;
}
#endif
/* /*
* Allow the user to impress friends. * Allow the user to impress friends.
...@@ -1232,15 +1212,8 @@ void __init smp_boot_cpus(void) ...@@ -1232,15 +1212,8 @@ void __init smp_boot_cpus(void)
} }
} }
} }
#ifndef CONFIG_VISWS smpboot_setup_io_apic();
/*
* Here we can be sure that there is an IO-APIC in the system. Let's
* go and set it up:
*/
if (!skip_ioapic_setup && nr_ioapics)
setup_IO_APIC();
#endif
/* /*
* Set up all local APIC timers in the system: * Set up all local APIC timers in the system:
......
/* two abstractions specific to kernel/smpboot.c, mainly to cater to visws
* which needs to alter them. */
static inline void smpboot_clear_io_apic_irqs(void)
{
io_apic_irqs = 0;
}
static inline void smpboot_setup_warm_reset_vector(void)
{
/*
* Install writable page 0 entry to set BIOS data area.
*/
local_flush_tlb();
/*
* Paranoid: Set warm reset code and vector here back
* to default values.
*/
CMOS_WRITE(0, 0xf);
*((volatile long *) phys_to_virt(0x467)) = 0;
}
static inline void smpboot_setup_io_apic(void)
{
/*
* Here we can be sure that there is an IO-APIC in the system. Let's
* go and set it up:
*/
if (!skip_ioapic_setup && nr_ioapics)
setup_IO_APIC();
}
/* for visws do nothing for any of these */
static inline void smpboot_clear_io_apic_irqs(void)
{
}
static inline void smpboot_setup_warm_reset_vector(void)
{
}
static inline void smpboot_setup_io_apic(void)
{
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment