lkml.org 
[lkml]   [2022]   [Aug]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 227/545] selftests: timers: valid-adjtimex: build fix for newer toolchains
    Date
    From: Wolfram Sang <wsa+renesas@sang-engineering.com>

    [ Upstream commit 9a162977d20436be5678a8e21a8e58eb4616d86a ]

    Toolchains with an include file 'sys/timex.h' based on 3.18 will have a
    'clock_adjtime' definition added, so it can't be static in the code:

    valid-adjtimex.c:43:12: error: static declaration of ‘clock_adjtime’ follows non-static declaration

    Fixes: e03a58c320e1 ("kselftests: timers: Add adjtimex SETOFFSET validity tests")
    Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
    Acked-by: John Stultz <jstultz@google.com>
    Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    tools/testing/selftests/timers/valid-adjtimex.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/tools/testing/selftests/timers/valid-adjtimex.c b/tools/testing/selftests/timers/valid-adjtimex.c
    index 5397de708d3c..48b9a803235a 100644
    --- a/tools/testing/selftests/timers/valid-adjtimex.c
    +++ b/tools/testing/selftests/timers/valid-adjtimex.c
    @@ -40,7 +40,7 @@
    #define ADJ_SETOFFSET 0x0100

    #include <sys/syscall.h>
    -static int clock_adjtime(clockid_t id, struct timex *tx)
    +int clock_adjtime(clockid_t id, struct timex *tx)
    {
    return syscall(__NR_clock_adjtime, id, tx);
    }
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-08-19 18:12    [W:4.014 / U:0.096 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site