[05/16] xtensa: ISS: avoid struct timeval

Message ID 20191108213257.3097633-6-arnd@arndb.de
State Superseded
Headers show
Series
  • [01/16] staging: exfat: use prandom_u32() for i_generation
Related show

Commit Message

Arnd Bergmann Nov. 8, 2019, 9:32 p.m.
'struct timeval' will get removed from the kernel, change the one
user in arch/xtensa to avoid referencing it, by using a fixed-length
array instead.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

---
 arch/xtensa/platforms/iss/include/platform/simcall.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-- 
2.20.0

Comments

Max Filippov Nov. 8, 2019, 9:38 p.m. | #1
On Fri, Nov 8, 2019 at 1:34 PM Arnd Bergmann <arnd@arndb.de> wrote:
>

> 'struct timeval' will get removed from the kernel, change the one

> user in arch/xtensa to avoid referencing it, by using a fixed-length

> array instead.

>

> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

> ---

>  arch/xtensa/platforms/iss/include/platform/simcall.h | 4 ++--

>  1 file changed, 2 insertions(+), 2 deletions(-)


Acked-by: Max Filippov <jcmvbkbc@gmail.com>


-- 
Thanks.
-- Max

Patch

diff --git a/arch/xtensa/platforms/iss/include/platform/simcall.h b/arch/xtensa/platforms/iss/include/platform/simcall.h
index 2ba45858e50a..4e2a48380dbf 100644
--- a/arch/xtensa/platforms/iss/include/platform/simcall.h
+++ b/arch/xtensa/platforms/iss/include/platform/simcall.h
@@ -113,9 +113,9 @@  static inline int simc_write(int fd, const void *buf, size_t count)
 
 static inline int simc_poll(int fd)
 {
-	struct timeval tv = { .tv_sec = 0, .tv_usec = 0 };
+	long timeval[2] = { 0, 0 };
 
-	return __simc(SYS_select_one, fd, XTISS_SELECT_ONE_READ, (int)&tv);
+	return __simc(SYS_select_one, fd, XTISS_SELECT_ONE_READ, (int)&timeval);
 }
 
 static inline int simc_lseek(int fd, uint32_t off, int whence)