lkml.org 
[lkml]   [2017]   [Jun]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:locking/core] tools/lib/lockdep: Fix 'defined but not used' warning for init_utsname()
    Commit-ID:  1baa75406ecc2d77c9e6ecf45a707838a5bf7f29
    Gitweb: http://git.kernel.org/tip/1baa75406ecc2d77c9e6ecf45a707838a5bf7f29
    Author: Ben Hutchings <ben@decadent.org.uk>
    AuthorDate: Thu, 25 May 2017 12:58:39 +0000
    Committer: Ingo Molnar <mingo@kernel.org>
    CommitDate: Mon, 5 Jun 2017 09:28:06 +0200

    tools/lib/lockdep: Fix 'defined but not used' warning for init_utsname()

    We define init_utsname() as static but not inline, resulting
    in a warning for every source file that includes lockdep.h but
    doesn't call it.

    Since it is only used by lockdep.c, define it in there.

    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Cc: a.p.zijlstra@chello.nl
    Link: http://lkml.kernel.org/r/20170525130005.5947-8-alexander.levin@verizon.com
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
    ---
    tools/lib/lockdep/lockdep.c | 10 ++++++++++
    tools/lib/lockdep/uinclude/linux/lockdep.h | 10 ----------
    2 files changed, 10 insertions(+), 10 deletions(-)

    diff --git a/tools/lib/lockdep/lockdep.c b/tools/lib/lockdep/lockdep.c
    index 443acb1..209f967 100644
    --- a/tools/lib/lockdep/lockdep.c
    +++ b/tools/lib/lockdep/lockdep.c
    @@ -12,4 +12,14 @@ u32 prandom_u32(void)
    abort();
    }

    +static struct new_utsname *init_utsname(void)
    +{
    + static struct new_utsname n = (struct new_utsname) {
    + .release = "liblockdep",
    + .version = LIBLOCKDEP_VERSION,
    + };
    +
    + return &n;
    +}
    +
    #include "../../../kernel/locking/lockdep.c"
    diff --git a/tools/lib/lockdep/uinclude/linux/lockdep.h b/tools/lib/lockdep/uinclude/linux/lockdep.h
    index d107903..c157242 100644
    --- a/tools/lib/lockdep/uinclude/linux/lockdep.h
    +++ b/tools/lib/lockdep/uinclude/linux/lockdep.h
    @@ -44,16 +44,6 @@ static inline int debug_locks_off(void)
    #define atomic_t unsigned long
    #define atomic_inc(x) ((*(x))++)

    -static struct new_utsname *init_utsname(void)
    -{
    - static struct new_utsname n = (struct new_utsname) {
    - .release = "liblockdep",
    - .version = LIBLOCKDEP_VERSION,
    - };
    -
    - return &n;
    -}
    -
    #define print_tainted() ""
    #define static_obj(x) 1

    \
     
     \ /
      Last update: 2017-06-05 11:37    [W:4.256 / U:0.600 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site