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

Commit 818d8462 authored by Chris Metcalf's avatar Chris Metcalf
Browse files

arch/tile: cleanups for tilegx compat mode 



These changes make the syscall table line up correctly for
tilegx compat mode, and remove the stale sys32_fadvise64() function,
which isn't actually used by any syscall table.

Signed-off-by: default avatarChris Metcalf <cmetcalf@tilera.com>
parent f4de51de

arch/tile/include/asm/unistd.h

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#if !defined(_ASM_TILE_UNISTD_H) || defined(__SYSCALL)

#define _ASM_TILE_UNISTD_H



#ifndef __LP64__

#if !defined(__LP64__) || defined(__SYSCALL_COMPAT)

/* Use the flavor of this syscall that matches the 32-bit API better. */

#define __ARCH_WANT_SYNC_FILE_RANGE2

#endif

arch/tile/kernel/compat.c

+0 −11
Original line number Diff line number Diff line
@@ -142,19 +142,8 @@ long tile_compat_sys_msgrcv(int msqid, 
#define compat_sys_msgsnd tile_compat_sys_msgsnd



/* See comments in sys.c */

#define compat_sys_fadvise64 sys32_fadvise64

#define compat_sys_fadvise64_64 sys32_fadvise64_64

#define compat_sys_readahead sys32_readahead

#define compat_sys_sync_file_range compat_sys_sync_file_range2



/* We leverage the "struct stat64" type for 32-bit time_t/nsec. */

#define compat_sys_stat64 sys_stat64

#define compat_sys_lstat64 sys_lstat64

#define compat_sys_fstat64 sys_fstat64

#define compat_sys_fstatat64 sys_fstatat64



/* The native sys_ptrace dynamically handles compat binaries. */

#define compat_sys_ptrace sys_ptrace



/* Call the trampolines to manage pt_regs where necessary. */

#define compat_sys_execve _compat_sys_execve

arch/tile/kernel/sys.c

+0 −9
Original line number Diff line number Diff line
@@ -56,13 +56,6 @@ ssize_t sys32_readahead(int fd, u32 offset_lo, u32 offset_hi, u32 count) 
	return sys_readahead(fd, ((loff_t)offset_hi << 32) | offset_lo, count);

}



long sys32_fadvise64(int fd, u32 offset_lo, u32 offset_hi,

		     u32 len, int advice)

{

	return sys_fadvise64_64(fd, ((loff_t)offset_hi << 32) | offset_lo,

				len, advice);

}



int sys32_fadvise64_64(int fd, u32 offset_lo, u32 offset_hi,

		       u32 len_lo, u32 len_hi, int advice)

{
@@ -103,10 +96,8 @@ SYSCALL_DEFINE6(mmap, unsigned long, addr, unsigned long, len, 


#ifndef __tilegx__

/* See comments at the top of the file. */

#define sys_fadvise64 sys32_fadvise64

#define sys_fadvise64_64 sys32_fadvise64_64

#define sys_readahead sys32_readahead

#define sys_sync_file_range sys_sync_file_range2

#endif



/* Call the trampolines to manage pt_regs where necessary. */