tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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: Chris Metcalf <cmetcalf@tilera.com>
+1
-21
+1
-1
arch/tile/include/asm/unistd.h
+1
-1
arch/tile/include/asm/unistd.h
···
15
15
#if !defined(_ASM_TILE_UNISTD_H) || defined(__SYSCALL)
16
16
#define _ASM_TILE_UNISTD_H
17
17
18
-
#ifndef __LP64__
18
+
#if !defined(__LP64__) || defined(__SYSCALL_COMPAT)
19
19
/* Use the flavor of this syscall that matches the 32-bit API better. */
20
20
#define __ARCH_WANT_SYNC_FILE_RANGE2
21
21
#endif
-11
arch/tile/kernel/compat.c
-11
arch/tile/kernel/compat.c
···
142
142
#define compat_sys_msgsnd tile_compat_sys_msgsnd
143
143
144
144
/* See comments in sys.c */
145
-
#define compat_sys_fadvise64 sys32_fadvise64
146
145
#define compat_sys_fadvise64_64 sys32_fadvise64_64
147
146
#define compat_sys_readahead sys32_readahead
148
-
#define compat_sys_sync_file_range compat_sys_sync_file_range2
149
-
150
-
/* We leverage the "struct stat64" type for 32-bit time_t/nsec. */
151
-
#define compat_sys_stat64 sys_stat64
152
-
#define compat_sys_lstat64 sys_lstat64
153
-
#define compat_sys_fstat64 sys_fstat64
154
-
#define compat_sys_fstatat64 sys_fstatat64
155
-
156
-
/* The native sys_ptrace dynamically handles compat binaries. */
157
-
#define compat_sys_ptrace sys_ptrace
158
147
159
148
/* Call the trampolines to manage pt_regs where necessary. */
160
149
#define compat_sys_execve _compat_sys_execve
-9
arch/tile/kernel/sys.c
-9
arch/tile/kernel/sys.c
···
56
56
return sys_readahead(fd, ((loff_t)offset_hi << 32) | offset_lo, count);
57
57
}
58
58
59
-
long sys32_fadvise64(int fd, u32 offset_lo, u32 offset_hi,
60
-
u32 len, int advice)
61
-
{
62
-
return sys_fadvise64_64(fd, ((loff_t)offset_hi << 32) | offset_lo,
63
-
len, advice);
64
-
}
65
-
66
59
int sys32_fadvise64_64(int fd, u32 offset_lo, u32 offset_hi,
67
60
u32 len_lo, u32 len_hi, int advice)
68
61
{
···
96
103
97
104
#ifndef __tilegx__
98
105
/* See comments at the top of the file. */
99
-
#define sys_fadvise64 sys32_fadvise64
100
106
#define sys_fadvise64_64 sys32_fadvise64_64
101
107
#define sys_readahead sys32_readahead
102
-
#define sys_sync_file_range sys_sync_file_range2
103
108
#endif
104
109
105
110
/* Call the trampolines to manage pt_regs where necessary. */