Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
2e092a28
Commit
2e092a28
authored
Jul 15, 2002
by
James Bottomley
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove last CONFIG_VISWS remnants from arch/i386/kernel
parent
2c2d007b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
53 additions
and
34 deletions
+53
-34
arch/i386/kernel/smpboot.c
arch/i386/kernel/smpboot.c
+7
-34
arch/i386/mach-generic/smpboot_hooks.h
arch/i386/mach-generic/smpboot_hooks.h
+33
-0
arch/i386/mach-visws/smpboot_hooks.h
arch/i386/mach-visws/smpboot_hooks.h
+13
-0
No files found.
arch/i386/kernel/smpboot.c
View file @
2e092a28
...
...
@@ -51,6 +51,7 @@
#include <asm/smpboot.h>
#include <asm/desc.h>
#include <asm/arch_hooks.h>
#include "smpboot_hooks.h"
/* Set if we find a B stepping CPU */
static
int
__initdata
smp_b_stepping
;
...
...
@@ -1072,9 +1073,7 @@ void __init smp_boot_cpus(void)
*/
if
(
!
smp_found_config
)
{
printk
(
KERN_NOTICE
"SMP motherboard not detected.
\n
"
);
#ifndef CONFIG_VISWS
io_apic_irqs
=
0
;
#endif
smpboot_clear_io_apic_irqs
();
cpu_online_map
=
phys_cpu_present_map
=
1
;
if
(
APIC_init_uniprocessor
())
printk
(
KERN_NOTICE
"Local APIC not detected."
...
...
@@ -1101,9 +1100,7 @@ void __init smp_boot_cpus(void)
printk
(
KERN_ERR
"BIOS bug, local APIC #%d not detected!...
\n
"
,
boot_cpu_physical_apicid
);
printk
(
KERN_ERR
"... forcing use of dummy APIC emulation. (tell your hw vendor)
\n
"
);
#ifndef CONFIG_VISWS
io_apic_irqs
=
0
;
#endif
smpboot_clear_io_apic_irqs
();
cpu_online_map
=
phys_cpu_present_map
=
1
;
goto
smp_done
;
}
...
...
@@ -1116,9 +1113,7 @@ void __init smp_boot_cpus(void)
if
(
!
max_cpus
)
{
smp_found_config
=
0
;
printk
(
KERN_INFO
"SMP mode deactivated, forcing use of dummy APIC emulation.
\n
"
);
#ifndef CONFIG_VISWS
io_apic_irqs
=
0
;
#endif
smpboot_clear_io_apic_irqs
();
cpu_online_map
=
phys_cpu_present_map
=
1
;
goto
smp_done
;
}
...
...
@@ -1165,22 +1160,7 @@ void __init smp_boot_cpus(void)
/*
* Cleanup possible dangling ends...
*/
#ifndef CONFIG_VISWS
{
/*
* 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
smpboot_setup_warm_reset_vector
();
/*
* Allow the user to impress friends.
...
...
@@ -1232,15 +1212,8 @@ void __init smp_boot_cpus(void)
}
}
}
#ifndef CONFIG_VISWS
/*
* 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
smpboot_setup_io_apic
();
/*
* Set up all local APIC timers in the system:
...
...
arch/i386/mach-generic/smpboot_hooks.h
0 → 100644
View file @
2e092a28
/* 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
();
}
arch/i386/mach-visws/smpboot_hooks.h
0 → 100644
View file @
2e092a28
/* 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
)
{
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment