diff options
author | Peter Zijlstra <a.p.zijlstra@chello.nl> | 2010-08-20 08:30:41 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-08-20 08:59:39 -0400 |
commit | ed8052616680e72f58bca678d4d1678cb12a7e47 (patch) | |
tree | e0898bc1bb3eafcd83006457829511f6eb0f3dc2 | |
parent | 4c1c952e37c7511a52f617ceddbc10c855d45d7b (diff) |
perf: Remove superfluous return values from perf_callchain_*()
Fixes these build warnings introduced by the callchain
rework:
arch/x86/kernel/cpu/perf_event.c: In function ‘perf_callchain_kernel’:
arch/x86/kernel/cpu/perf_event.c:1646: warning: ‘return’ with a value, in function returning void
arch/x86/kernel/cpu/perf_event.c: In function ‘perf_callchain_user’:
arch/x86/kernel/cpu/perf_event.c:1699: warning: ‘return’ with a value, in function returning void
arch/x86/kernel/cpu/perf_event.c: At top level:
arch/x86/kernel/cpu/perf_event.c:1607: warning: ‘perf_callchain_entry_nmi’ defined but not used
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Acked-by: Frederic Weisbecker <fweisbec@gmail.com>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r-- | arch/x86/kernel/cpu/perf_event.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c index 8e91cf34a9c8..acc52afaf7bf 100644 --- a/arch/x86/kernel/cpu/perf_event.c +++ b/arch/x86/kernel/cpu/perf_event.c | |||
@@ -1610,7 +1610,7 @@ perf_callchain_kernel(struct perf_callchain_entry *entry, struct pt_regs *regs) | |||
1610 | { | 1610 | { |
1611 | if (perf_guest_cbs && perf_guest_cbs->is_in_guest()) { | 1611 | if (perf_guest_cbs && perf_guest_cbs->is_in_guest()) { |
1612 | /* TODO: We don't support guest os callchain now */ | 1612 | /* TODO: We don't support guest os callchain now */ |
1613 | return NULL; | 1613 | return; |
1614 | } | 1614 | } |
1615 | 1615 | ||
1616 | perf_callchain_store(entry, regs->ip); | 1616 | perf_callchain_store(entry, regs->ip); |
@@ -1663,7 +1663,7 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs) | |||
1663 | 1663 | ||
1664 | if (perf_guest_cbs && perf_guest_cbs->is_in_guest()) { | 1664 | if (perf_guest_cbs && perf_guest_cbs->is_in_guest()) { |
1665 | /* TODO: We don't support guest os callchain now */ | 1665 | /* TODO: We don't support guest os callchain now */ |
1666 | return NULL; | 1666 | return; |
1667 | } | 1667 | } |
1668 | 1668 | ||
1669 | fp = (void __user *)regs->bp; | 1669 | fp = (void __user *)regs->bp; |