Commit 48f0d1cf authored by Wolfram Sang's avatar Wolfram Sang Committed by Zheng Zengkai
Browse files

selftests: timers: valid-adjtimex: build fix for newer toolchains

stable inclusion
from stable-v5.10.137
commit ee3cc4c7612143bfa731725180c42e58afb70c35
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I60PLB

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=ee3cc4c7612143bfa731725180c42e58afb70c35



--------------------------------

[ Upstream commit 9a162977 ]

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: e03a58c3 ("kselftests: timers: Add adjtimex SETOFFSET validity tests")
Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: default avatarJohn Stultz <jstultz@google.com>
Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
Reviewed-by: default avatarWei Li <liwei391@huawei.com>
parent 940b9131
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment