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
nexedi
linux
Commits
52fdb568
Commit
52fdb568
authored
Aug 20, 2009
by
Thomas Gleixner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
x86: Move mpc_oem_pci_bus to x86_init_ops
Signed-off-by:
Thomas Gleixner
<
tglx@linutronix.de
>
parent
72302142
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
4 deletions
+6
-4
arch/x86/include/asm/setup.h
arch/x86/include/asm/setup.h
+0
-1
arch/x86/include/asm/x86_init.h
arch/x86/include/asm/x86_init.h
+3
-0
arch/x86/kernel/apic/numaq_32.c
arch/x86/kernel/apic/numaq_32.c
+1
-1
arch/x86/kernel/mpparse.c
arch/x86/kernel/mpparse.c
+2
-2
No files found.
arch/x86/include/asm/setup.h
View file @
52fdb568
...
...
@@ -24,7 +24,6 @@ struct x86_quirks {
int
(
*
mach_find_smp_config
)(
unsigned
int
reserve
);
void
(
*
mpc_oem_bus_info
)(
struct
mpc_bus
*
m
,
char
*
name
);
void
(
*
mpc_oem_pci_bus
)(
struct
mpc_bus
*
m
);
};
extern
void
x86_quirk_intr_init
(
void
);
...
...
arch/x86/include/asm/x86_init.h
View file @
52fdb568
#ifndef _ASM_X86_PLATFORM_H
#define _ASM_X86_PLATFORM_H
struct
mpc_bus
;
struct
mpc_cpu
;
struct
mpc_table
;
...
...
@@ -10,12 +11,14 @@ struct mpc_table;
* @setup_ioapic_ids: platform specific ioapic id override
* @mpc_apic_id: platform specific mpc apic id assignment
* @smp_read_mpc_oem: platform specific oem mpc table setup
* @mpc_oem_pci_bus: platform specific pci bus setup (default NULL)
*/
struct
x86_init_mpparse
{
void
(
*
mpc_record
)(
unsigned
int
mode
);
void
(
*
setup_ioapic_ids
)(
void
);
int
(
*
mpc_apic_id
)(
struct
mpc_cpu
*
m
);
void
(
*
smp_read_mpc_oem
)(
struct
mpc_table
*
mpc
);
void
(
*
mpc_oem_pci_bus
)(
struct
mpc_bus
*
m
);
};
/**
...
...
arch/x86/kernel/apic/numaq_32.c
View file @
52fdb568
...
...
@@ -271,7 +271,6 @@ static struct x86_quirks numaq_x86_quirks __initdata = {
.
mach_get_smp_config
=
NULL
,
.
mach_find_smp_config
=
NULL
,
.
mpc_oem_bus_info
=
mpc_oem_bus_info
,
.
mpc_oem_pci_bus
=
mpc_oem_pci_bus
,
};
static
__init
void
early_check_numaq
(
void
)
...
...
@@ -293,6 +292,7 @@ static __init void early_check_numaq(void)
x86_init
.
mpparse
.
setup_ioapic_ids
=
x86_init_noop
;
x86_init
.
mpparse
.
mpc_apic_id
=
mpc_apic_id
;
x86_init
.
mpparse
.
smp_read_mpc_oem
=
smp_read_mpc_oem
;
x86_init
.
mpparse
.
mpc_oem_pci_bus
=
mpc_oem_pci_bus
;
}
}
...
...
arch/x86/kernel/mpparse.c
View file @
52fdb568
...
...
@@ -98,8 +98,8 @@ static void __init MP_bus_info(struct mpc_bus *m)
mp_bus_id_to_type
[
m
->
busid
]
=
MP_BUS_ISA
;
#endif
}
else
if
(
strncmp
(
str
,
BUSTYPE_PCI
,
sizeof
(
BUSTYPE_PCI
)
-
1
)
==
0
)
{
if
(
x86_
quirks
->
mpc_oem_pci_bus
)
x86_
quirks
->
mpc_oem_pci_bus
(
m
);
if
(
x86_
init
.
mpparse
.
mpc_oem_pci_bus
)
x86_
init
.
mpparse
.
mpc_oem_pci_bus
(
m
);
clear_bit
(
m
->
busid
,
mp_bus_not_pci
);
#if defined(CONFIG_EISA) || defined(CONFIG_MCA)
...
...
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