linux-user: make getcpu optional
PATCH 1/1 linux-user: make getcpu optional
Not all arches implement this, and the kernel doesn't require them to. Add ifdef logic to disable it when not available.
--- linux-user/syscall.c | 4 ++++ target/bfin/op_helper.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-)
linux-user/syscall.c +4 -0
@@ -290,8 +290,10 @@ _syscall3(int, sys_sched_getaffinity, pid_t, pid, unsigned int, len,#define __NR_sys_sched_setaffinity __NR_sched_setaffinity _syscall3(int, sys_sched_setaffinity, pid_t, pid, unsigned int, len, unsigned long *, user_mask_ptr); +#ifdef TARGET_NR_getcpu#define __NR_sys_getcpu __NR_getcpu _syscall3(int, sys_getcpu, unsigned *, cpu, unsigned *, node, void *, tcache); +#endif _syscall4(int, reboot, int, magic1, int, magic2, unsigned int, cmd, void *, arg); _syscall2(int, capget, struct __user_cap_header_struct *, header,
@@ -10595,6 +10597,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, ret =get_errno (sys_sched_setaffinity (arg1, mask_size, mask)); }break ; +#ifdef TARGET_NR_getcpucase TARGET_NR_getcpu: {unsigned cpu, node;
@@ -10612,6 +10615,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, } }break ; +#endif case TARGET_NR_sched_setparam: {struct sched_param *target_schp;
target/bfin/op_helper.c +2 -2
@@ -18,8 +18,8 @@NULL, it means that the function was called in C code (i.e. not from generated code or from helper.c) */ /* XXX: fix it to restore all registers */ -void tlb_fill (CPUState *cs,target_ulong addr,MMUAccessType access_type, -int mmu_idx,uintptr_t retaddr) +void tlb_fill (CPUState *cs,target_ulong addr,int size, +MMUAccessType access_type,int mmu_idx,uintptr_t retaddr) {int ret;
Signature · 1 line
2.16.1
PATCH v2 1/1 linux-user: make getcpu optional
Not all arches implement this, and the kernel doesn't require them to. Add ifdef logic to disable it when not available.
--- linux-user/syscall.c | 4 ++++ 1 file changed, 4 insertions(+)
linux-user/syscall.c +4 -0
@@ -290,8 +290,10 @@ _syscall3(int, sys_sched_getaffinity, pid_t, pid, unsigned int, len,#define __NR_sys_sched_setaffinity __NR_sched_setaffinity _syscall3(int, sys_sched_setaffinity, pid_t, pid, unsigned int, len, unsigned long *, user_mask_ptr); +#ifdef TARGET_NR_getcpu#define __NR_sys_getcpu __NR_getcpu _syscall3(int, sys_getcpu, unsigned *, cpu, unsigned *, node, void *, tcache); +#endif _syscall4(int, reboot, int, magic1, int, magic2, unsigned int, cmd, void *, arg); _syscall2(int, capget, struct __user_cap_header_struct *, header,
@@ -10595,6 +10597,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, ret =get_errno (sys_sched_setaffinity (arg1, mask_size, mask)); }break ; +#ifdef TARGET_NR_getcpucase TARGET_NR_getcpu: {unsigned cpu, node;
@@ -10612,6 +10615,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, } }break ; +#endif case TARGET_NR_sched_setparam: {struct sched_param *target_schp;
Signature · 1 line
2.16.1
Le 17/02/2018 à 03:02, Mike Frysinger a écrit :
Quoted 13 lines
Not all arches implement this, and the kernel doesn't require them to. Add ifdef logic to disable it when not available.
Signed-off-by Mike Frysinger <[email protected]>--- linux-user/syscall.c | 4 ++++ 1 file changed, 4 insertions(+)linux-user/syscall.c +0
-0
linux-user/syscall.c _syscall3(int, sys_sched_getaffinity, pid_t, pid, unsigned int, len, · line 296
Quoted 7 lines
linux-user/syscall.c +2
-0@@ -290,8 +290,10 @@ _syscall3(int, sys_sched_getaffinity, pid_t, pid, unsigned int, len,#define __NR_sys_sched_setaffinity __NR_sched_setaffinity _syscall3(int, sys_sched_setaffinity, pid_t, pid, unsigned int, len, unsigned long *, user_mask_ptr); +#ifdef TARGET_NR_getcpu#define __NR_sys_getcpu __NR_getcpu _syscall3(int, sys_getcpu, unsigned *, cpu, unsigned *, node, void *, tcache); +#endif
I didn't find any arch that doesn't have it in linux-user/*/syscall_nr.h Which arches are you speaking about?
As it can be also undefined for the host arch, you should use:
#if defined(TARGET_NR_getcpu) && defined(__NR_getcpu)
Thanks,
Laurent