diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-24 18:07:03 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-24 18:07:03 +0200 |
| commit | 5fabc487c96819dd12ddb9414835d170fd9cd6d5 (patch) | |
| tree | 01532d492e5074b0d3add29bf92ebf9a9d161e9e /kernel/sched_features.h | |
| parent | Merge branch 'upstream/xen-tracing2' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
| parent | KVM: IOMMU: Disable device assignment without interrupt remapping (diff) | |
| download | linux-5fabc487c96819dd12ddb9414835d170fd9cd6d5.tar.xz linux-5fabc487c96819dd12ddb9414835d170fd9cd6d5.zip | |
Merge branch 'kvm-updates/3.1' of git://git.kernel.org/pub/scm/virt/kvm/kvm
* 'kvm-updates/3.1' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (143 commits)
KVM: IOMMU: Disable device assignment without interrupt remapping
KVM: MMU: trace mmio page fault
KVM: MMU: mmio page fault support
KVM: MMU: reorganize struct kvm_shadow_walk_iterator
KVM: MMU: lockless walking shadow page table
KVM: MMU: do not need atomicly to set/clear spte
KVM: MMU: introduce the rules to modify shadow page table
KVM: MMU: abstract some functions to handle fault pfn
KVM: MMU: filter out the mmio pfn from the fault pfn
KVM: MMU: remove bypass_guest_pf
KVM: MMU: split kvm_mmu_free_page
KVM: MMU: count used shadow pages on prepareing path
KVM: MMU: rename 'pt_write' to 'emulate'
KVM: MMU: cleanup for FNAME(fetch)
KVM: MMU: optimize to handle dirty bit
KVM: MMU: cache mmio info on page fault path
KVM: x86: introduce vcpu_mmio_gva_to_gpa to cleanup the code
KVM: MMU: do not update slot bitmap if spte is nonpresent
KVM: MMU: fix walking shadow page table
KVM guest: KVM Steal time registration
...
Diffstat (limited to 'kernel/sched_features.h')
| -rw-r--r-- | kernel/sched_features.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/sched_features.h b/kernel/sched_features.h index 1e7066d76c26..2e74677cb040 100644 --- a/kernel/sched_features.h +++ b/kernel/sched_features.h @@ -61,9 +61,9 @@ SCHED_FEAT(LB_BIAS, 1) SCHED_FEAT(OWNER_SPIN, 1) /* - * Decrement CPU power based on irq activity + * Decrement CPU power based on time not spent running tasks */ -SCHED_FEAT(NONIRQ_POWER, 1) +SCHED_FEAT(NONTASK_POWER, 1) /* * Queue remote wakeups on the target CPU and process them |