@@ -1101,7 +1101,7 @@ static u32 apic_get_tmcct(struct kvm_lapic *apic)
1101
1101
apic -> lapic_timer .period == 0 )
1102
1102
return 0 ;
1103
1103
1104
- now = apic -> lapic_timer . timer . base -> get_time ();
1104
+ now = ktime_get ();
1105
1105
remaining = ktime_sub (apic -> lapic_timer .target_expiration , now );
1106
1106
if (ktime_to_ns (remaining ) < 0 )
1107
1107
remaining = ktime_set (0 , 0 );
@@ -1333,7 +1333,7 @@ static void start_sw_tscdeadline(struct kvm_lapic *apic)
1333
1333
1334
1334
local_irq_save (flags );
1335
1335
1336
- now = apic -> lapic_timer . timer . base -> get_time ();
1336
+ now = ktime_get ();
1337
1337
guest_tsc = kvm_read_l1_tsc (vcpu , rdtsc ());
1338
1338
if (likely (tscdeadline > guest_tsc )) {
1339
1339
ns = (tscdeadline - guest_tsc ) * 1000000ULL ;
@@ -1354,7 +1354,7 @@ static void start_sw_period(struct kvm_lapic *apic)
1354
1354
return ;
1355
1355
1356
1356
if (apic_lvtt_oneshot (apic ) &&
1357
- ktime_after (apic -> lapic_timer . timer . base -> get_time (),
1357
+ ktime_after (ktime_get (),
1358
1358
apic -> lapic_timer .target_expiration )) {
1359
1359
apic_timer_expired (apic );
1360
1360
return ;
@@ -1370,7 +1370,7 @@ static bool set_target_expiration(struct kvm_lapic *apic)
1370
1370
ktime_t now ;
1371
1371
u64 tscl = rdtsc ();
1372
1372
1373
- now = apic -> lapic_timer . timer . base -> get_time ();
1373
+ now = ktime_get ();
1374
1374
apic -> lapic_timer .period = (u64 )kvm_lapic_get_reg (apic , APIC_TMICT )
1375
1375
* APIC_BUS_CYCLE_NS * apic -> divide_count ;
1376
1376
0 commit comments