Skip to contentSkip to conversation

x86: vdso: change time() prototype to match __vdso_time()

PATCH New Arnd Bergmann 2 participants 2 messages Dec 4, 2017 – Dec 6, 2017

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86: vdso: change time() prototype to match __vdso_time()

gcc-8 warns that time() is an alias for __vdso_time() but the two have different prototypes:

arch/x86/entry/vdso/vclock_gettime.c:327:5: error: 'time' alias between functions of incompatible types 'int(time_t *)' {aka 'int(long int *)'} and 'time_t(time_t *)' {aka 'long int(long int *)'} [-Werror=attribute-alias]
int time(time_t *t)

     ^~~~

arch/x86/entry/vdso/vclock_gettime.c:318:16: note: aliased declaration here

I could not figure out whether this is intentional, but I see that changing it to return time_t avoids the warning.

Returning 'int' from time() is also a bit questionable, as it causes an overflow in y2038 even on 64-bit architectures that use a 64-bit time_t type. On 32-bit architecture with 64-bit time_t, time() should always be implement by the C library by calling a (to be added) clock_gettime() variant that takes a sufficiently wide argument.

---
 arch/x86/entry/vdso/vclock_gettime.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/entry/vdso/vclock_gettime.c +1 -1
index b179d73c53bf..ebd1ab0b21a2 100644
@@ -324,5 +324,5 @@ notrace time_t __vdso_time(time_t *t)
 		*t = result;
 	return result;
 }
-int time(time_t *t)
+time_t time(time_t *t)
 	__attribute__((weak, alias("__vdso_time")));
Signature · 1 line
2.9.0
#1 lore raw

[tip:x86/urgent] x86/vdso: Change time() prototype to match __vdso_time()

x86/vdso: Change time() prototype to match __vdso_time()
Commit-ID:  88edb57d1e0b262e669c5cad36646dcf5a7f37f5
Gitweb:     https://git.kernel.org/tip/88edb57d1e0b262e669c5cad36646dcf5a7f37f5
Author:     Arnd Bergmann <[email protected]>
AuthorDate: Mon, 4 Dec 2017 16:01:55 +0100
Committer:  Ingo Molnar <[email protected]>
CommitDate: Wed, 6 Dec 2017 21:31:46 +0100

x86/vdso: Change time() prototype to match __vdso_time()

gcc-8 warns that time() is an alias for __vdso_time() but the two have different prototypes:

arch/x86/entry/vdso/vclock_gettime.c:327:5: error: 'time' alias between functions of incompatible types 'int(time_t *)' {aka 'int(long int *)'} and 'time_t(time_t *)' {aka 'long int(long int *)'} [-Werror=attribute-alias]
int time(time_t *t)

       ^~~~

arch/x86/entry/vdso/vclock_gettime.c:318:16: note: aliased declaration here

I could not figure out whether this is intentional, but I see that changing it to return time_t avoids the warning.

Returning 'int' from time() is also a bit questionable, as it causes an overflow in y2038 even on 64-bit architectures that use a 64-bit time_t type. On 32-bit architecture with 64-bit time_t, time() should always be implement by the C library by calling a (to be added) clock_gettime() variant that takes a sufficiently wide argument.

---
 arch/x86/entry/vdso/vclock_gettime.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/entry/vdso/vclock_gettime.c +1 -1
index 11b13c4..f19856d 100644
@@ -324,5 +324,5 @@ notrace time_t __vdso_time(time_t *t)
 		*t = result;
 	return result;
 }
-int time(time_t *t)
+time_t time(time_t *t)
 	__attribute__((weak, alias("__vdso_time")));