alistair23-linux/arch/x86/oprofile
Robert Richter de346b6949 Merge branch 'perf/core' into oprofile/master
Merge reason: Resolve conflicts with Don's NMI rework:

    commit 9c48f1c629
    Author: Don Zickus <dzickus@redhat.com>
    Date:   Fri Sep 30 15:06:21 2011 -0400
    x86, nmi: Wire up NMI handlers to new routines

Conflicts:
	arch/x86/oprofile/nmi_timer_int.c

Signed-off-by: Robert Richter <robert.richter@amd.com>
2011-11-08 15:52:15 +01:00
..
backtrace.c x86, perf: Make copy_from_user_nmi() a library function 2011-07-21 20:41:57 +02:00
init.c oprofile, x86: Reimplement nmi timer mode using perf event 2011-11-04 16:27:18 +01:00
Makefile oprofile, x86: Reimplement nmi timer mode using perf event 2011-11-04 16:27:18 +01:00
nmi_int.c Merge branch 'perf/core' into oprofile/master 2011-11-08 15:52:15 +01:00
op_counter.h oprofile, x86: Allow setting EDGE/INV/CMASK for counter events 2011-03-24 18:45:44 +01:00
op_model_amd.c oprofile, x86: Add comments to IBS LVT offset initialization 2011-05-30 16:36:54 +02:00
op_model_p4.c Kill off warning: ‘inline’ is not at beginning of declaration 2011-01-19 15:43:08 +01:00
op_model_ppro.c oprofile, x86: Fix overflow and warning (commit 1d12d35) 2011-08-16 23:51:00 +02:00
op_x86_model.h oprofile/x86: make AMD IBS hotplug capable 2010-05-06 15:11:15 +02:00