lkml.org 
[lkml]   [2009]   [May]   [28]   [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: Fix perf_counter_init_task() on !CONFIG_PERF_COUNTERS
    Commit-ID:  d3e78ee3d015dac1794433abb6403b6fc8e70e10
    Gitweb: http://git.kernel.org/tip/d3e78ee3d015dac1794433abb6403b6fc8e70e10
    Author: Ingo Molnar <mingo@elte.hu>
    AuthorDate: Thu, 28 May 2009 11:41:50 +0200
    Committer: Ingo Molnar <mingo@elte.hu>
    CommitDate: Thu, 28 May 2009 11:42:16 +0200

    perf_counter: Fix perf_counter_init_task() on !CONFIG_PERF_COUNTERS

    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 | 2 +-
    1 files changed, 1 insertions(+), 1 deletions(-)

    diff --git a/include/linux/perf_counter.h b/include/linux/perf_counter.h
    index 2b16ed3..a65ddc5 100644
    --- a/include/linux/perf_counter.h
    +++ b/include/linux/perf_counter.h
    @@ -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) { }

    \
     
     \ /
      Last update: 2009-05-28 11:51    [W:5.061 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site