diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2009-08-20 03:59:09 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2009-08-31 03:35:45 -0400 |
commit | 66bcaf0bde100a4b54b82fc6fea6ceee2212ffb4 (patch) | |
tree | 4d9e290bcf8da7e043d12f047b10ea4b6c3f33ff /arch/x86/lguest | |
parent | d9112f43021554ded2ef2b9bea5f88ba4b52abe0 (diff) |
x86: Move irq_init to x86_init_ops
irq_init is overridden by x86_quirks and by paravirts. Unify the whole
mess and make it an unconditional x86_init_ops function which defaults
to the standard function and can be overridden by the early platform
code.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/lguest')
-rw-r--r-- | arch/x86/lguest/boot.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c index 11445c176de..1ff986511f1 100644 --- a/arch/x86/lguest/boot.c +++ b/arch/x86/lguest/boot.c | |||
@@ -1262,7 +1262,6 @@ __init void lguest_init(void) | |||
1262 | */ | 1262 | */ |
1263 | 1263 | ||
1264 | /* Interrupt-related operations */ | 1264 | /* Interrupt-related operations */ |
1265 | pv_irq_ops.init_IRQ = lguest_init_IRQ; | ||
1266 | pv_irq_ops.save_fl = PV_CALLEE_SAVE(save_fl); | 1265 | pv_irq_ops.save_fl = PV_CALLEE_SAVE(save_fl); |
1267 | pv_irq_ops.restore_fl = __PV_IS_CALLEE_SAVE(lg_restore_fl); | 1266 | pv_irq_ops.restore_fl = __PV_IS_CALLEE_SAVE(lg_restore_fl); |
1268 | pv_irq_ops.irq_disable = PV_CALLEE_SAVE(irq_disable); | 1267 | pv_irq_ops.irq_disable = PV_CALLEE_SAVE(irq_disable); |
@@ -1325,6 +1324,7 @@ __init void lguest_init(void) | |||
1325 | pv_time_ops.get_tsc_khz = lguest_tsc_khz; | 1324 | pv_time_ops.get_tsc_khz = lguest_tsc_khz; |
1326 | 1325 | ||
1327 | x86_init.resources.memory_setup = lguest_memory_setup; | 1326 | x86_init.resources.memory_setup = lguest_memory_setup; |
1327 | x86_init.irqs.intr_init = lguest_init_IRQ; | ||
1328 | 1328 | ||
1329 | /* | 1329 | /* |
1330 | * Now is a good time to look at the implementations of these functions | 1330 | * Now is a good time to look at the implementations of these functions |