Ingo Molnar 96200591a3 Merge branch 'tracing/hw-breakpoints' into perf/core ...

Conflicts:
	arch/x86/kernel/kprobes.c
	kernel/trace/Makefile

Merge reason: hw-breakpoints perf integration is looking
              good in testing and in reviews, plus conflicts
              are mounting up - so merge & resolve.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

2009-11-21 14:07:23 +01:00

..

emulate.c

KVM: x86 emulator: Add adc and sbb missing decoder flags

2009-09-10 10:46:51 +03:00

i8254.c

KVM: use proper hrtimer function to retrieve expiration time

2009-10-16 12:30:25 -03:00

i8254.h

KVM: PIT support for HPET legacy mode

2009-09-10 08:33:12 +03:00

i8259.c

KVM: Replace pic_lock()/pic_unlock() with direct call to spinlock functions

2009-09-10 08:33:22 +03:00

irq.c

KVM: Remove irq_pending bitmap

2009-06-10 11:48:57 +03:00

irq.h

KVM: Call kvm_vcpu_kick() inside pic spinlock

2009-09-10 08:33:21 +03:00

Kconfig

KVM: remove old KVMTRACE support code

2009-09-10 08:33:03 +03:00

kvm_cache_regs.h

KVM: Cache pdptrs

2009-09-10 08:32:46 +03:00

kvm_timer.h

KVM: Use pointer to vcpu instead of vcpu_id in timer code.

2009-09-10 08:32:52 +03:00

lapic.c

KVM: use proper hrtimer function to retrieve expiration time

2009-10-16 12:30:25 -03:00

lapic.h

KVM: x2apic interface to lapic

2009-09-10 08:33:08 +03:00

Makefile

KVM: Rename x86_emulate.c to emulate.c

2009-09-10 10:46:45 +03:00

mmu.c

KVM: MMU: fix pointer cast

2009-10-16 12:30:26 -03:00

mmu.h

KVM: MMU: add kvm_mmu_get_spte_hierarchy helper

2009-09-10 08:32:56 +03:00

mmutrace.h

KVM: Trace shadow page lifecycle

2009-09-10 08:33:10 +03:00

paging_tmpl.h

KVM: MMU: add SPTE_HOST_WRITEABLE flag to the shadow ptes

2009-10-04 17:04:50 +02:00

svm.c

KVM: SVM: Handle tsc in svm_get_msr/svm_set_msr correctly

2009-10-04 13:57:23 +02:00

timer.c

KVM: Drop useless atomic test from timer function

2009-09-10 08:32:57 +03:00

trace.h

KVM: Add trace points in irqchip code

2009-09-10 08:33:11 +03:00

tss.h

KVM: x86: hardware task switching support

2008-04-27 12:00:39 +03:00

vmx.c

KVM: VMX: flush TLB with INVEPT on cpu migration

2009-10-04 13:57:24 +02:00

x86.c

Merge branch 'tracing/hw-breakpoints' into perf/core

2009-11-21 14:07:23 +01:00

x86.h

KVM: Add Directed EOI support to APIC emulation

2009-09-10 08:33:07 +03:00