diff options
author | Jeremy Fitzhardinge <jeremy@goop.org> | 2007-05-02 13:27:18 -0400 |
---|---|---|
committer | Andi Kleen <andi@basil.nowhere.org> | 2007-05-02 13:27:18 -0400 |
commit | 0260c196c97e48e4b821031ae55912c22113ed87 (patch) | |
tree | 124e7f247573f75cebeec39c5d92f38a9ba48075 /arch/i386 | |
parent | 25c16b992c32db4bc7e085b763abd866a505ca72 (diff) |
[PATCH] i386: PARAVIRT: fix startup_ipi_hook config dependency
startup_ipi_hook depends on CONFIG_X86_LOCAL_APIC, so move it to the
right part of the paravirt_ops initialization.
Signed-off-by: Jeremy Fitzhardinge <jeremy@xensource.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Diffstat (limited to 'arch/i386')
-rw-r--r-- | arch/i386/kernel/paravirt.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/i386/kernel/paravirt.c b/arch/i386/kernel/paravirt.c index f99d3d78c53f..5c10f376bce1 100644 --- a/arch/i386/kernel/paravirt.c +++ b/arch/i386/kernel/paravirt.c | |||
@@ -292,6 +292,7 @@ struct paravirt_ops paravirt_ops = { | |||
292 | .apic_read = native_apic_read, | 292 | .apic_read = native_apic_read, |
293 | .setup_boot_clock = setup_boot_APIC_clock, | 293 | .setup_boot_clock = setup_boot_APIC_clock, |
294 | .setup_secondary_clock = setup_secondary_APIC_clock, | 294 | .setup_secondary_clock = setup_secondary_APIC_clock, |
295 | .startup_ipi_hook = paravirt_nop, | ||
295 | #endif | 296 | #endif |
296 | .set_lazy_mode = paravirt_nop, | 297 | .set_lazy_mode = paravirt_nop, |
297 | 298 | ||
@@ -342,8 +343,6 @@ struct paravirt_ops paravirt_ops = { | |||
342 | .dup_mmap = paravirt_nop, | 343 | .dup_mmap = paravirt_nop, |
343 | .exit_mmap = paravirt_nop, | 344 | .exit_mmap = paravirt_nop, |
344 | .activate_mm = paravirt_nop, | 345 | .activate_mm = paravirt_nop, |
345 | |||
346 | .startup_ipi_hook = paravirt_nop, | ||
347 | }; | 346 | }; |
348 | 347 | ||
349 | EXPORT_SYMBOL(paravirt_ops); | 348 | EXPORT_SYMBOL(paravirt_ops); |