diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-23 02:24:17 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-23 02:24:17 (GMT) |
| commit | 0fd56c70334d7899edaee742ae49d9b893951376 (patch) | |
| tree | 76b82ef119aa4a5ef8bbacb8256aeaba4277f7e1 /kernel | |
| parent | 56d61a0e26c5a61c66d1ac259a59960295939da9 (diff) | |
| parent | 49d3bd7e2b990e717aa66e229410b8f5096c4956 (diff) | |
| download | linux-0fd56c70334d7899edaee742ae49d9b893951376.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm:
KVM: Use new smp_call_function_mask() in kvm_flush_remote_tlbs()
sched: don't clear PF_VCPU in scheduler
KVM: Improve local apic timer wraparound handling
KVM: Fix local apic timer divide by zero
KVM: Move kvm_guest_exit() after local_irq_enable()
KVM: x86 emulator: fix access registers for instructions with ModR/M byte and Mod = 3
KVM: VMX: Force vm86 mode if setting flags during real mode
KVM: x86 emulator: implement 'movnti mem, reg'
KVM: VMX: Reset mmu context when entering real mode
KVM: VMX: Handle NMIs before enabling interrupts and preemption
KVM: MMU: Set shadow pte atomically in mmu_pte_write_zap_pte()
KVM: x86 emulator: fix repne/repnz decoding
KVM: x86 emulator: fix merge screwup due to emulator split
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sched.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index 7581e33..2810e56 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -3375,7 +3375,6 @@ void account_system_time(struct task_struct *p, int hardirq_offset, if (p->flags & PF_VCPU) { account_guest_time(p, cputime); - p->flags &= ~PF_VCPU; return; } |