diff options
| author | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2012-03-28 18:37:36 +0200 |
|---|---|---|
| committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2012-05-01 20:50:09 +0200 |
| commit | 4a8e2a3115e7aa4bd2deb4c6483d47c743e0fbb3 (patch) | |
| tree | ccf267b6602e79f48bc99b4614ebd6f3787970cf /arch/x86/kernel/setup.c | |
| parent | Linux 3.4-rc5 (diff) | |
| download | linux-4a8e2a3115e7aa4bd2deb4c6483d47c743e0fbb3.tar.xz linux-4a8e2a3115e7aa4bd2deb4c6483d47c743e0fbb3.zip | |
x86/apic: Replace io_apic_ops with x86_io_apic_ops.
Which makes the code fit within the rest of the x86_ops functions.
Acked-by: Suresh Siddha <suresh.b.siddha@intel.com>
[v1: Changed x86_apic -> x86_ioapic per Yinghai Lu <yinghai@kernel.org> suggestion]
[v2: Rebased on tip/x86/urgent and redid to match Ingo's syntax style]
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'arch/x86/kernel/setup.c')
| -rw-r--r-- | arch/x86/kernel/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 1a2901562059..8526317c5f0b 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -1012,7 +1012,7 @@ void __init setup_arch(char **cmdline_p) init_cpu_to_node(); init_apic_mappings(); - ioapic_and_gsi_init(); + x86_io_apic_ops.init(); kvm_guest_init(); |