Merge branch 'oprofile-for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into oprofile

Browse source

Conflicts:
	arch/x86/oprofile/nmi_int.c

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

...

This commit is contained in:

Ingo Molnar 2008-09-30 12:19:41 +02:00

parent 59293c8ad5 f78e80209c

commit 0d15504f16

10 changed files with 46 additions and 246 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

100

arch/x86/oprofile/nmi_int.c

View file

3

arch/x86/oprofile/op_counter.h

View file

76

arch/x86/oprofile/op_model_amd.c

View file

4

arch/x86/oprofile/op_model_p4.c

View file

2

arch/x86/oprofile/op_model_ppro.c

View file

3

arch/x86/oprofile/op_x86_model.h

View file

58

drivers/oprofile/oprof.c

View file

4

drivers/oprofile/oprof.h

View file

39

drivers/oprofile/oprofile_files.c

View file

3

include/linux/oprofile.h

View file