diff options
author | Peter Zijlstra <a.p.zijlstra@chello.nl> | 2010-01-29 07:25:12 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-02-04 03:59:50 -0500 |
commit | fce877e3a429940a986e085a41e8b57f2d922e36 (patch) | |
tree | 5bdf6beeda1cfe774dc2a633454bd4d1546e1c08 /arch/x86/kernel | |
parent | 8c48e444191de0ff84e85d41180d7bc3e74f14ef (diff) |
bitops: Ensure the compile time HWEIGHT is only used for such
Avoid accidental misuse by failing to compile things
Suggested-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r-- | arch/x86/kernel/cpu/perf_event.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c index 5b91992b6b25..96cfc1a4fe9f 100644 --- a/arch/x86/kernel/cpu/perf_event.c +++ b/arch/x86/kernel/cpu/perf_event.c | |||
@@ -93,13 +93,16 @@ struct cpu_hw_events { | |||
93 | struct perf_event *event_list[X86_PMC_IDX_MAX]; /* in enabled order */ | 93 | struct perf_event *event_list[X86_PMC_IDX_MAX]; /* in enabled order */ |
94 | }; | 94 | }; |
95 | 95 | ||
96 | #define EVENT_CONSTRAINT(c, n, m) { \ | 96 | #define __EVENT_CONSTRAINT(c, n, m, w) {\ |
97 | { .idxmsk64[0] = (n) }, \ | 97 | { .idxmsk64[0] = (n) }, \ |
98 | .code = (c), \ | 98 | .code = (c), \ |
99 | .cmask = (m), \ | 99 | .cmask = (m), \ |
100 | .weight = HWEIGHT64((u64)(n)), \ | 100 | .weight = (w), \ |
101 | } | 101 | } |
102 | 102 | ||
103 | #define EVENT_CONSTRAINT(c, n, m) \ | ||
104 | __EVENT_CONSTRAINT(c, n, m, HWEIGHT(n)) | ||
105 | |||
103 | #define INTEL_EVENT_CONSTRAINT(c, n) \ | 106 | #define INTEL_EVENT_CONSTRAINT(c, n) \ |
104 | EVENT_CONSTRAINT(c, n, INTEL_ARCH_EVTSEL_MASK) | 107 | EVENT_CONSTRAINT(c, n, INTEL_ARCH_EVTSEL_MASK) |
105 | 108 | ||
@@ -2622,7 +2625,8 @@ void __init init_hw_perf_events(void) | |||
2622 | register_die_notifier(&perf_event_nmi_notifier); | 2625 | register_die_notifier(&perf_event_nmi_notifier); |
2623 | 2626 | ||
2624 | unconstrained = (struct event_constraint) | 2627 | unconstrained = (struct event_constraint) |
2625 | EVENT_CONSTRAINT(0, (1ULL << x86_pmu.num_events) - 1, 0); | 2628 | __EVENT_CONSTRAINT(0, (1ULL << x86_pmu.num_events) - 1, |
2629 | 0, x86_pmu.num_events); | ||
2626 | 2630 | ||
2627 | pr_info("... version: %d\n", x86_pmu.version); | 2631 | pr_info("... version: %d\n", x86_pmu.version); |
2628 | pr_info("... bit width: %d\n", x86_pmu.event_bits); | 2632 | pr_info("... bit width: %d\n", x86_pmu.event_bits); |