Revert "Oprofile Multiplexing Patch"
authorRobert Richter <robert.richter@amd.com>
Wed, 24 Sep 2008 09:08:52 +0000 (11:08 +0200)
committerRobert Richter <robert.richter@amd.com>
Wed, 24 Sep 2008 09:08:52 +0000 (11:08 +0200)
commit4c168eaf7ea39f25a45a3d8c7eebc3fedb633a1d
tree315bb66a3ce2e752749a780876e2b7b5f6a596de
parent45f197ade73ba95681b9803680c75352fc0a1c0a
Revert "Oprofile Multiplexing Patch"

Reverting commit 1a960b402a51d80abf54e3f8e4972374ffe5f22d for the main
branch. Multiplexing will be tracked on a separate feature branch.

Conflicts:

    arch/x86/oprofile/nmi_int.c
arch/x86/oprofile/nmi_int.c
arch/x86/oprofile/op_counter.h
arch/x86/oprofile/op_model_amd.c
arch/x86/oprofile/op_model_p4.c
arch/x86/oprofile/op_model_ppro.c
arch/x86/oprofile/op_x86_model.h
drivers/oprofile/oprof.c
drivers/oprofile/oprof.h
drivers/oprofile/oprofile_files.c
include/linux/oprofile.h