* [LTP] [PATCH] syscalls/clock_adjtime: Fix compiler error
@ 2019-04-11 6:57 Yang Xu
2019-04-11 7:46 ` Cyril Hrubis
0 siblings, 1 reply; 5+ messages in thread
From: Yang Xu @ 2019-04-11 6:57 UTC (permalink / raw)
To: ltp
'ADJ_OFFSET_SS_READ' 'ADJ_NANO' 'STA_NANO' and 'ADJ_MICRO' are not defined on
some old distros, so add them into 'include/lapi/posix_clocks.h' to fix it.
These macros are introduced by the following commit:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=52bfb36
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=eea83d8
sys_clock_adjtime are introduced by the following commit:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=339dc50
Signed-off-by: Yang Xu <xuyang2018.jy@cn.fujitsu.com>
---
include/lapi/posix_clocks.h | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/include/lapi/posix_clocks.h b/include/lapi/posix_clocks.h
index b1f7a7c55..1d29107d8 100644
--- a/include/lapi/posix_clocks.h
+++ b/include/lapi/posix_clocks.h
@@ -39,4 +39,20 @@
# define CLOCK_BOOTTIME_ALARM 9
#endif
+#ifndef ADJ_OFFSET_SS_READ
+# define ADJ_OFFSET_SS_READ 0xa001
+#endif
+
+#ifndef ADJ_NANO
+# define ADJ_NANO 0x2000
+#endif
+
+#ifndef STA_NANO
+# define STA_NANO 0x2000
+#endif
+
+#ifndef ADJ_MICRO
+# define ADJ_MICRO 0x1000
+#endif
+
#endif /* POSIX_CLOCKS_H__ */
--
2.18.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [LTP] [PATCH] syscalls/clock_adjtime: Fix compiler error
2019-04-11 6:57 [LTP] [PATCH] syscalls/clock_adjtime: Fix compiler error Yang Xu
@ 2019-04-11 7:46 ` Cyril Hrubis
2019-04-11 7:54 ` xuyang
2019-04-11 9:12 ` [LTP] [PATCH v2] " Yang Xu
0 siblings, 2 replies; 5+ messages in thread
From: Cyril Hrubis @ 2019-04-11 7:46 UTC (permalink / raw)
To: ltp
Hi!
> 'ADJ_OFFSET_SS_READ' 'ADJ_NANO' 'STA_NANO' and 'ADJ_MICRO' are not defined on
> some old distros, so add them into 'include/lapi/posix_clocks.h' to fix it.
>
> These macros are introduced by the following commit:
> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=52bfb36
> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=eea83d8
>
> sys_clock_adjtime are introduced by the following commit:
> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=339dc50
>
> Signed-off-by: Yang Xu <xuyang2018.jy@cn.fujitsu.com>
> ---
> include/lapi/posix_clocks.h | 16 ++++++++++++++++
> 1 file changed, 16 insertions(+)
>
> diff --git a/include/lapi/posix_clocks.h b/include/lapi/posix_clocks.h
> index b1f7a7c55..1d29107d8 100644
> --- a/include/lapi/posix_clocks.h
> +++ b/include/lapi/posix_clocks.h
> @@ -39,4 +39,20 @@
> # define CLOCK_BOOTTIME_ALARM 9
> #endif
>
> +#ifndef ADJ_OFFSET_SS_READ
> +# define ADJ_OFFSET_SS_READ 0xa001
> +#endif
> +
> +#ifndef ADJ_NANO
> +# define ADJ_NANO 0x2000
> +#endif
> +
> +#ifndef STA_NANO
> +# define STA_NANO 0x2000
> +#endif
> +
> +#ifndef ADJ_MICRO
> +# define ADJ_MICRO 0x1000
> +#endif
Can we start a new header in the lapi called timex.h and put these
there? Other than that this looks good.
--
Cyril Hrubis
chrubis@suse.cz
^ permalink raw reply [flat|nested] 5+ messages in thread
* [LTP] [PATCH] syscalls/clock_adjtime: Fix compiler error
2019-04-11 7:46 ` Cyril Hrubis
@ 2019-04-11 7:54 ` xuyang
2019-04-11 9:12 ` [LTP] [PATCH v2] " Yang Xu
1 sibling, 0 replies; 5+ messages in thread
From: xuyang @ 2019-04-11 7:54 UTC (permalink / raw)
To: ltp
on 2019/4/11 15:46, Cyril Hrubis wrote:
> Hi!
>> 'ADJ_OFFSET_SS_READ' 'ADJ_NANO' 'STA_NANO' and 'ADJ_MICRO' are not defined on
>> some old distros, so add them into 'include/lapi/posix_clocks.h' to fix it.
>>
>> These macros are introduced by the following commit:
>> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=52bfb36
>> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=eea83d8
>>
>> sys_clock_adjtime are introduced by the following commit:
>> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=339dc50
>>
>> Signed-off-by: Yang Xu<xuyang2018.jy@cn.fujitsu.com>
>> ---
>> include/lapi/posix_clocks.h | 16 ++++++++++++++++
>> 1 file changed, 16 insertions(+)
>>
>> diff --git a/include/lapi/posix_clocks.h b/include/lapi/posix_clocks.h
>> index b1f7a7c55..1d29107d8 100644
>> --- a/include/lapi/posix_clocks.h
>> +++ b/include/lapi/posix_clocks.h
>> @@ -39,4 +39,20 @@
>> # define CLOCK_BOOTTIME_ALARM 9
>> #endif
>>
>> +#ifndef ADJ_OFFSET_SS_READ
>> +# define ADJ_OFFSET_SS_READ 0xa001
>> +#endif
>> +
>> +#ifndef ADJ_NANO
>> +# define ADJ_NANO 0x2000
>> +#endif
>> +
>> +#ifndef STA_NANO
>> +# define STA_NANO 0x2000
>> +#endif
>> +
>> +#ifndef ADJ_MICRO
>> +# define ADJ_MICRO 0x1000
>> +#endif
> Can we start a new header in the lapi called timex.h and put these
> there? Other than that this looks good.
>
I forget this. OK ,I will move it into a new header called timex.h.
^ permalink raw reply [flat|nested] 5+ messages in thread
* [LTP] [PATCH v2] syscalls/clock_adjtime: Fix compiler error
2019-04-11 7:46 ` Cyril Hrubis
2019-04-11 7:54 ` xuyang
@ 2019-04-11 9:12 ` Yang Xu
2019-04-11 10:33 ` Cyril Hrubis
1 sibling, 1 reply; 5+ messages in thread
From: Yang Xu @ 2019-04-11 9:12 UTC (permalink / raw)
To: ltp
'ADJ_OFFSET_SS_READ' 'ADJ_NANO' 'STA_NANO' and 'ADJ_MICRO' are not defined on
some old distros, so add them into a new 'include/lapi/timex.h' to fix it.
Also move ADJ_ALL macro into this new header file.
These macros are introduced by the following commit:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=52bfb36
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=eea83d8
sys_clock_adjtime are introduced by the following commit:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=339dc
Signed-off-by: Yang Xu <xuyang2018.jy@cn.fujitsu.com>
---
include/lapi/posix_clocks.h | 4 ---
include/lapi/timex.h | 30 +++++++++++++++++++
.../syscalls/clock_adjtime/clock_adjtime.h | 1 +
3 files changed, 31 insertions(+), 4 deletions(-)
create mode 100644 include/lapi/timex.h
diff --git a/include/lapi/posix_clocks.h b/include/lapi/posix_clocks.h
index b1f7a7c55..4914479ac 100644
--- a/include/lapi/posix_clocks.h
+++ b/include/lapi/posix_clocks.h
@@ -11,10 +11,6 @@
#define MAX_CLOCKS 16
-#define ADJ_ALL (ADJ_OFFSET | ADJ_FREQUENCY | ADJ_MAXERROR | \
- ADJ_ESTERROR | ADJ_STATUS | ADJ_TIMECONST | \
- ADJ_TICK)
-
#ifndef CLOCK_MONOTONIC_RAW
# define CLOCK_MONOTONIC_RAW 4
#endif
diff --git a/include/lapi/timex.h b/include/lapi/timex.h
new file mode 100644
index 000000000..c2c9e4d8d
--- /dev/null
+++ b/include/lapi/timex.h
@@ -0,0 +1,30 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) 2019 FUJITSU LIMITED. All rights reserved.
+ * Author: Yang Xu <xuyang2018.jy@cn.fujitsu.com>
+ */
+
+#ifndef LAPI_TIMEX_H__
+# define LAPI_TIMEX_H__
+
+#define ADJ_ALL (ADJ_OFFSET | ADJ_FREQUENCY | ADJ_MAXERROR | \
+ ADJ_ESTERROR | ADJ_STATUS | ADJ_TIMECONST | \
+ ADJ_TICK)
+
+#ifndef ADJ_OFFSET_SS_READ
+# define ADJ_OFFSET_SS_READ 0xa001
+#endif
+
+#ifndef ADJ_NANO
+# define ADJ_NANO 0x2000
+#endif
+
+#ifndef STA_NANO
+# define STA_NANO 0x2000
+#endif
+
+#ifndef ADJ_MICRO
+# define ADJ_MICRO 0x1000
+#endif
+
+#endif/* LAPI_TIMEX_H__ */
diff --git a/testcases/kernel/syscalls/clock_adjtime/clock_adjtime.h b/testcases/kernel/syscalls/clock_adjtime/clock_adjtime.h
index 34b97fdfa..d7f553a3a 100644
--- a/testcases/kernel/syscalls/clock_adjtime/clock_adjtime.h
+++ b/testcases/kernel/syscalls/clock_adjtime/clock_adjtime.h
@@ -14,6 +14,7 @@
#include <pwd.h>
#include <sys/timex.h>
#include <sys/types.h>
+#include "lapi/timex.h"
static int sys_clock_adjtime(clockid_t, struct timex *);
static void timex_show(char *, struct timex);
--
2.18.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-04-11 10:33 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-04-11 6:57 [LTP] [PATCH] syscalls/clock_adjtime: Fix compiler error Yang Xu
2019-04-11 7:46 ` Cyril Hrubis
2019-04-11 7:54 ` xuyang
2019-04-11 9:12 ` [LTP] [PATCH v2] " Yang Xu
2019-04-11 10:33 ` Cyril Hrubis
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox