forked from luck/tmp_suning_uos_patched
perf_counter: Work around gcc warning by initializing tracepoint record unconditionally
Despite that the tracepoint record is always present when the PERF_SAMPLE_TP_RECORD flag is set, gcc raises a warning, thinking it might not be initialized: kernel/perf_counter.c: In function ‘perf_counter_output’: kernel/perf_counter.c:2650: warning: ‘tp’ may be used uninitialized in this function Then, initialize it to NULL and always check if it's not NULL before dereference it. Reported-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Mike Galbraith <efault@gmx.de> Cc: Paul Mackerras <paulus@samba.org> LKML-Reference: <1249698400-5441-2-git-send-email-fweisbec@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
parent
25446036cb
commit
10b8e30660
|
@ -2646,7 +2646,7 @@ static void perf_counter_output(struct perf_counter *counter, int nmi,
|
|||
u64 counter;
|
||||
} group_entry;
|
||||
struct perf_callchain_entry *callchain = NULL;
|
||||
struct perf_tracepoint_record *tp;
|
||||
struct perf_tracepoint_record *tp = NULL;
|
||||
int callchain_size = 0;
|
||||
u64 time;
|
||||
struct {
|
||||
|
@ -2717,7 +2717,8 @@ static void perf_counter_output(struct perf_counter *counter, int nmi,
|
|||
|
||||
if (sample_type & PERF_SAMPLE_TP_RECORD) {
|
||||
tp = data->private;
|
||||
header.size += tp->size;
|
||||
if (tp)
|
||||
header.size += tp->size;
|
||||
}
|
||||
|
||||
ret = perf_output_begin(&handle, counter, header.size, nmi, 1);
|
||||
|
@ -2783,7 +2784,7 @@ static void perf_counter_output(struct perf_counter *counter, int nmi,
|
|||
}
|
||||
}
|
||||
|
||||
if (sample_type & PERF_SAMPLE_TP_RECORD)
|
||||
if ((sample_type & PERF_SAMPLE_TP_RECORD) && tp)
|
||||
perf_output_copy(&handle, tp->record, tp->size);
|
||||
|
||||
perf_output_end(&handle);
|
||||
|
|
Loading…
Reference in New Issue
Block a user