Skip to content

Commit

Permalink
perf_counter: x86: use ULL postfix for 64bit constants
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Peter Zijlstra authored and Ingo Molnar committed Apr 6, 2009
1 parent 60b3df9 commit 82bae4f
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions arch/x86/kernel/cpu/perf_counter.c
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,9 @@ static u64 pmc_intel_event_map(int event)

static u64 pmc_intel_raw_event(u64 event)
{
#define CORE_EVNTSEL_EVENT_MASK 0x000000FF
#define CORE_EVNTSEL_UNIT_MASK 0x0000FF00
#define CORE_EVNTSEL_COUNTER_MASK 0xFF000000
#define CORE_EVNTSEL_EVENT_MASK 0x000000FFULL
#define CORE_EVNTSEL_UNIT_MASK 0x0000FF00ULL
#define CORE_EVNTSEL_COUNTER_MASK 0xFF000000ULL

#define CORE_EVNTSEL_MASK \
(CORE_EVNTSEL_EVENT_MASK | \
Expand Down Expand Up @@ -116,9 +116,9 @@ static u64 pmc_amd_event_map(int event)

static u64 pmc_amd_raw_event(u64 event)
{
#define K7_EVNTSEL_EVENT_MASK 0x7000000FF
#define K7_EVNTSEL_UNIT_MASK 0x00000FF00
#define K7_EVNTSEL_COUNTER_MASK 0x0FF000000
#define K7_EVNTSEL_EVENT_MASK 0x7000000FFULL
#define K7_EVNTSEL_UNIT_MASK 0x00000FF00ULL
#define K7_EVNTSEL_COUNTER_MASK 0x0FF000000ULL

#define K7_EVNTSEL_MASK \
(K7_EVNTSEL_EVENT_MASK | \
Expand Down

0 comments on commit 82bae4f

Please sign in to comment.