]> Pileus Git - ~andy/linux/commitdiff
perf_counter: Fix perf_counter_init_task() on !CONFIG_PERF_COUNTERS
authorIngo Molnar <mingo@elte.hu>
Thu, 28 May 2009 09:41:50 +0000 (11:41 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 28 May 2009 09:42:16 +0000 (11:42 +0200)
Pointed out by compiler warnings:

   tip/include/linux/perf_counter.h:644: warning: no return statement in function returning non-void

Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: John Kacur <jkacur@redhat.com>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
include/linux/perf_counter.h

index 2b16ed37b74cc14cb3df40a3234490b775c8472b..a65ddc580514d9260959298d05595970701ebfa1 100644 (file)
@@ -641,7 +641,7 @@ perf_counter_task_sched_out(struct task_struct *task,
                            struct task_struct *next, int cpu)          { }
 static inline void
 perf_counter_task_tick(struct task_struct *task, int cpu)              { }
-static inline int perf_counter_init_task(struct task_struct *child)    { }
+static inline int perf_counter_init_task(struct task_struct *child)    { return 0; }
 static inline void perf_counter_exit_task(struct task_struct *child)   { }
 static inline void perf_counter_do_pending(void)                       { }
 static inline void perf_counter_print_debug(void)                      { }