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

Commit ecec5ba6 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

fix uml-x86_64 



__NR_syscall_max is done in x86_64 asm-offsets; do an equivalent in
uml kern_constants.h

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Acked-by: default avatarJeff Dike <jdike@addtoit.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 327b9eeb

arch/um/include/sysdep-x86_64/kernel-offsets.h

+9 −0
Original line number Diff line number Diff line
@@ -17,7 +17,16 @@ 
#define OFFSET(sym, str, mem) \

	DEFINE(sym, offsetof(struct str, mem));



#define __NO_STUBS 1

#undef __SYSCALL

#undef _ASM_X86_64_UNISTD_H_

#define __SYSCALL(nr, sym) [nr] = 1,

static char syscalls[] = {

#include <asm/arch/unistd.h>

};



void foo(void)

{

#include <common-offsets.h>

DEFINE(UM_NR_syscall_max, sizeof(syscalls) - 1);

}

arch/um/include/sysdep-x86_64/syscalls.h

+2 −1
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 


#include <linux/msg.h>

#include <linux/shm.h>

#include <kern_constants.h>



typedef long syscall_handler_t(void);
@@ -29,6 +30,6 @@ extern long old_mmap(unsigned long addr, unsigned long len, 
extern syscall_handler_t sys_modify_ldt;

extern syscall_handler_t sys_arch_prctl;



#define NR_syscalls (__NR_syscall_max + 1)

#define NR_syscalls (UM_NR_syscall_max + 1)



#endif

arch/um/sys-x86_64/syscall_table.c

+3 −2
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#include <linux/linkage.h>

#include <linux/sys.h>

#include <linux/cache.h>

#include <kern_constants.h>



#define __NO_STUBS
@@ -45,8 +46,8 @@ typedef void (*sys_call_ptr_t)(void); 


extern void sys_ni_syscall(void);



sys_call_ptr_t sys_call_table[__NR_syscall_max+1] __cacheline_aligned = {

sys_call_ptr_t sys_call_table[UM_NR_syscall_max+1] __cacheline_aligned = {

	/* Smells like a like a compiler bug -- it doesn't work when the & below is removed. */

	[0 ... __NR_syscall_max] = &sys_ni_syscall,

	[0 ... UM_NR_syscall_max] = &sys_ni_syscall,

#include <asm-x86_64/unistd.h>

};