Skip to content

Commit

Permalink
perf_counter tools: fix event_id type
Browse files Browse the repository at this point in the history
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Wu Fengguang authored and Ingo Molnar committed Apr 6, 2009
1 parent ef45fa9 commit 3ab8d79
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions Documentation/perf_counter/kerneltop.c
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ static int run_perfstat = 0;
static int system_wide = 0;

static int nr_counters = 0;
static long event_id[MAX_COUNTERS] = DEF_PERFSTAT_EVENTS;
static __s64 event_id[MAX_COUNTERS] = DEF_PERFSTAT_EVENTS;
static int event_raw[MAX_COUNTERS];
static int event_count[MAX_COUNTERS];
static int fd[MAX_NR_CPUS][MAX_COUNTERS];
Expand Down Expand Up @@ -261,11 +261,11 @@ static int type_valid(int type)

static char *event_name(int ctr)
{
int type = event_id[ctr];
__s64 type = event_id[ctr];
static char buf[32];

if (event_raw[ctr]) {
sprintf(buf, "raw 0x%x", type);
sprintf(buf, "raw 0x%llx", (long long)type);
return buf;
}
if (!type_valid(type))
Expand Down Expand Up @@ -299,7 +299,8 @@ static int match_event_symbols(char *str)

static int parse_events(char *str)
{
int type, raw;
__s64 type;
int raw;

again:
if (nr_counters == MAX_COUNTERS)
Expand Down

0 comments on commit 3ab8d79

Please sign in to comment.