From 6080cf078f341bbc96c71b0772f633b7759274ef Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Fri, 30 Jan 2009 23:18:41 -0800 Subject: [PATCH] --- yaml --- r: 136703 b: refs/heads/master c: 664c7954721adfc9bd61de6ec78f89f482f1a802 h: refs/heads/master i: 136701: 52637f62ec081b608b3b4164ac4a963e06884c9e 136699: 2c232a84757c94759928b95bd5bfacf701be9de6 136695: ffe6017a707a90daa2ed3ce6ae5cedbc9166d8db 136687: aa38a2fa82bcf798c7b5f140f659de97a9f9474a 136671: 74e4fd166b7cd4c464f26f56a1ea1d455c8cf60d 136639: d46a3813c6e78319e81ad0af2b6d55473408c769 136575: 3200d94ac45d63995c1079fdd3b5eaa743090553 136447: bca31b92eec053d5bb343daf33d7c0b1798e7c7b 136191: f749f044fbaadf323e1460f6ca61fea5bbb127fe v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/vmi_32.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 2bc1a94c7ee6..27ff82f73ddf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e584f559c7b8711cccdf319400acd6294b2c074e +refs/heads/master: 664c7954721adfc9bd61de6ec78f89f482f1a802 diff --git a/trunk/arch/x86/kernel/vmi_32.c b/trunk/arch/x86/kernel/vmi_32.c index 1d3302cc2ddf..eb9e7347928e 100644 --- a/trunk/arch/x86/kernel/vmi_32.c +++ b/trunk/arch/x86/kernel/vmi_32.c @@ -670,10 +670,11 @@ static inline int __init activate_vmi(void) para_fill(pv_mmu_ops.write_cr2, SetCR2); para_fill(pv_mmu_ops.write_cr3, SetCR3); para_fill(pv_cpu_ops.write_cr4, SetCR4); - para_fill(pv_irq_ops.save_fl, GetInterruptMask); - para_fill(pv_irq_ops.restore_fl, SetInterruptMask); - para_fill(pv_irq_ops.irq_disable, DisableInterrupts); - para_fill(pv_irq_ops.irq_enable, EnableInterrupts); + + para_fill(pv_irq_ops.save_fl.func, GetInterruptMask); + para_fill(pv_irq_ops.restore_fl.func, SetInterruptMask); + para_fill(pv_irq_ops.irq_disable.func, DisableInterrupts); + para_fill(pv_irq_ops.irq_enable.func, EnableInterrupts); para_fill(pv_cpu_ops.wbinvd, WBINVD); para_fill(pv_cpu_ops.read_tsc, RDTSC);