Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c176f429 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman
Browse files

hexagon: fix fadvise64_64 calling conventions 

commit 896842284c6ccba25ec9d78b7b6e62cdd507c083 upstream.

fadvise64_64() has two 64-bit arguments at the wrong alignment
for hexagon, which turns them into a 7-argument syscall that is
not supported by Linux.

The downstream musl port for hexagon actually asks for a 6-argument
version the same way we do it on arm, csky, powerpc, so make the
kernel do it the same way to avoid having to change both.

Link: https://github.com/quic/musl/blob/hexagon/arch/hexagon/syscall_arch.h#L78


Cc: stable@vger.kernel.org
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 672d065b

arch/hexagon/include/asm/syscalls.h

0 → 100644
+6 −0
Original line number Original line Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */



#include <asm-generic/syscalls.h>



asmlinkage long sys_hexagon_fadvise64_64(int fd, int advice,

	                                  u32 a2, u32 a3, u32 a4, u32 a5);

arch/hexagon/kernel/syscalltab.c

+7 −0
Original line number Original line Diff line number Diff line
@@ -14,6 +14,13 @@ 
#undef __SYSCALL

#undef __SYSCALL

#define __SYSCALL(nr, call) [nr] = (call),

#define __SYSCALL(nr, call) [nr] = (call),





SYSCALL_DEFINE6(hexagon_fadvise64_64, int, fd, int, advice,

		SC_ARG64(offset), SC_ARG64(len))

{

	return ksys_fadvise64_64(fd, SC_VAL64(loff_t, offset), SC_VAL64(loff_t, len), advice);

}

#define sys_fadvise64_64 sys_hexagon_fadvise64_64



void *sys_call_table[__NR_syscalls] = {

void *sys_call_table[__NR_syscalls] = {

#include <asm/unistd.h>

#include <asm/unistd.h>

};
 
};