Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 210008
b: refs/heads/master
c: 8d33091
h: refs/heads/master
v: v3
  • Loading branch information
Lin Ming authored and Ingo Molnar committed Aug 25, 2010
1 parent a5c3c33 commit 46d49de
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 151772dbfad4dbe81721e40f9b3d588ea77bb7aa
refs/heads/master: 8d330919927ea31fa083b5a80084dc991da813a0
2 changes: 2 additions & 0 deletions trunk/arch/x86/kernel/cpu/perf_event_p4.c
Original file line number Diff line number Diff line change
Expand Up @@ -497,6 +497,8 @@ static int p4_hw_config(struct perf_event *event)
event->hw.config |= event->attr.config &
(p4_config_pack_escr(P4_ESCR_MASK_HT) |
p4_config_pack_cccr(P4_CCCR_MASK_HT | P4_CCCR_RESERVED));

event->hw.config &= ~P4_CCCR_FORCE_OVF;
}

rc = x86_setup_perfctr(event);
Expand Down

0 comments on commit 46d49de

Please sign in to comment.