aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2009-03-13 07:21:31 -0400
committerIngo Molnar <mingo@elte.hu>2009-04-06 03:29:34 -0400
commit82bae4f8c2fd64a2bb1e2e72c508853ed2b4a299 (patch)
tree3558f8a9c6622bde42582292b8433ab3ea02b01d
parent60b3df9c1e24a18aabb412da9905208c5f04ebea (diff)
perf_counter: x86: use ULL postfix for 64bit constants
Fix a build warning on 32bit machines by explicitly marking the constants as 64-bit. Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86/kernel/cpu/perf_counter.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/x86/kernel/cpu/perf_counter.c b/arch/x86/kernel/cpu/perf_counter.c
index a2e3b76bfdc1..22dab06c08a4 100644
--- a/arch/x86/kernel/cpu/perf_counter.c
+++ b/arch/x86/kernel/cpu/perf_counter.c
@@ -84,9 +84,9 @@ static u64 pmc_intel_event_map(int event)
84 84
85static u64 pmc_intel_raw_event(u64 event) 85static u64 pmc_intel_raw_event(u64 event)
86{ 86{
87#define CORE_EVNTSEL_EVENT_MASK 0x000000FF 87#define CORE_EVNTSEL_EVENT_MASK 0x000000FFULL
88#define CORE_EVNTSEL_UNIT_MASK 0x0000FF00 88#define CORE_EVNTSEL_UNIT_MASK 0x0000FF00ULL
89#define CORE_EVNTSEL_COUNTER_MASK 0xFF000000 89#define CORE_EVNTSEL_COUNTER_MASK 0xFF000000ULL
90 90
91#define CORE_EVNTSEL_MASK \ 91#define CORE_EVNTSEL_MASK \
92 (CORE_EVNTSEL_EVENT_MASK | \ 92 (CORE_EVNTSEL_EVENT_MASK | \
@@ -116,9 +116,9 @@ static u64 pmc_amd_event_map(int event)
116 116
117static u64 pmc_amd_raw_event(u64 event) 117static u64 pmc_amd_raw_event(u64 event)
118{ 118{
119#define K7_EVNTSEL_EVENT_MASK 0x7000000FF 119#define K7_EVNTSEL_EVENT_MASK 0x7000000FFULL
120#define K7_EVNTSEL_UNIT_MASK 0x00000FF00 120#define K7_EVNTSEL_UNIT_MASK 0x00000FF00ULL
121#define K7_EVNTSEL_COUNTER_MASK 0x0FF000000 121#define K7_EVNTSEL_COUNTER_MASK 0x0FF000000ULL
122 122
123#define K7_EVNTSEL_MASK \ 123#define K7_EVNTSEL_MASK \
124 (K7_EVNTSEL_EVENT_MASK | \ 124 (K7_EVNTSEL_EVENT_MASK | \