lkml.org 
[lkml]   [2009]   [Mar]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:perfcounters/core] perf_counter: x86: use ULL postfix for 64bit constants
    Commit-ID:  c93ccc55a700595a5522a65e5338adcdd76aeeb0
    Gitweb: http://git.kernel.org/tip/c93ccc55a700595a5522a65e5338adcdd76aeeb0
    Author: Peter Zijlstra <a.p.zijlstra@chello.nl>
    AuthorDate: Fri, 13 Mar 2009 12:21:31 +0100
    Commit: Ingo Molnar <mingo@elte.hu>
    CommitDate: Fri, 13 Mar 2009 13:59:09 +0100

    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>
    LKML-Reference: <20090313112301.477871320@chello.nl>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>


    ---
    arch/x86/kernel/cpu/perf_counter.c | 12 ++++++------
    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 a2e3b76..22dab06 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)

    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 | \
    @@ -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 | \

    \
     
     \ /
      Last update: 2009-03-13 14:07    [W:3.599 / U:0.264 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site