diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-06-08 15:49:03 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-06-08 15:49:03 +0200 |
| commit | 86dd7909c2c4ae3f219a9233bf0f095b05632ecf (patch) | |
| tree | 1808de2a661434cc8a930bc8f8a248c5cf70ca2c /arch/x86/oprofile | |
| parent | d7ebe75b065a7c2d58ffc12f9d2e00d5ea4e71eb (diff) | |
| parent | cbf74cea070fa1f705de4712e25d9e56ae6543c7 (diff) | |
| download | linux-86dd7909c2c4ae3f219a9233bf0f095b05632ecf.tar.gz linux-86dd7909c2c4ae3f219a9233bf0f095b05632ecf.tar.bz2 linux-86dd7909c2c4ae3f219a9233bf0f095b05632ecf.zip | |
Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/urgent
Diffstat (limited to 'arch/x86/oprofile')
| -rw-r--r-- | arch/x86/oprofile/op_model_amd.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/arch/x86/oprofile/op_model_amd.c b/arch/x86/oprofile/op_model_amd.c index 9fd8a567fe1e..9cbb710dc94b 100644 --- a/arch/x86/oprofile/op_model_amd.c +++ b/arch/x86/oprofile/op_model_amd.c @@ -609,16 +609,21 @@ static int setup_ibs_ctl(int ibs_eilvt_off) return 0; } +/* + * This runs only on the current cpu. We try to find an LVT offset and + * setup the local APIC. For this we must disable preemption. On + * success we initialize all nodes with this offset. This updates then + * the offset in the IBS_CTL per-node msr. The per-core APIC setup of + * the IBS interrupt vector is called from op_amd_setup_ctrs()/op_- + * amd_cpu_shutdown() using the new offset. + */ static int force_ibs_eilvt_setup(void) { int offset; int ret; - /* - * find the next free available EILVT entry, skip offset 0, - * pin search to this cpu - */ preempt_disable(); + /* find the next free available EILVT entry, skip offset 0 */ for (offset = 1; offset < APIC_EILVT_NR_MAX; offset++) { if (get_eilvt(offset)) break; |