From: Johannes Berg <johannes.berg@intel.com>
Date: Fri, 23 Aug 2019 13:05:46 +0000 (+0200)
Subject: um: Fix VDSO compiler warning
X-Git-Tag: v5.4.17~2662^2~14
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=7a1bb4f990ad422047b89540bc61bbcab81a07ea;p=people%2Faperard%2Flinux.git

um: Fix VDSO compiler warning

Fix a warning about the function type being wrong.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
---

diff --git a/arch/x86/um/vdso/um_vdso.c b/arch/x86/um/vdso/um_vdso.c
index ac9c02b9d92c8..891868756a51f 100644
--- a/arch/x86/um/vdso/um_vdso.c
+++ b/arch/x86/um/vdso/um_vdso.c
@@ -47,7 +47,7 @@ time_t __vdso_time(time_t *t)
 
 	return secs;
 }
-int time(time_t *t) __attribute__((weak, alias("__vdso_time")));
+time_t time(time_t *t) __attribute__((weak, alias("__vdso_time")));
 
 long
 __vdso_getcpu(unsigned *cpu, unsigned *node, struct getcpu_cache *unused)