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

Commit f87ea91d authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds
Browse files

uml: redo the calculation of NR_syscalls 



Redo the calculation of NR_syscalls since that disappeared from i386 and
use a similar mechanism on x86_64.

We now figure out the size of the system call table in arch code and stick
that in syscall_table_size.  arch/um/kernel/skas/syscall.c defines
NR_syscalls in terms of that since its the only thing that needs to know
how many system calls there are.

The old mechananism that was used on x86_64 is gone.

arch/um/include/sysdep-i386/syscalls.h got some formatting since I was
looking at it.

Signed-off-by: default avatarJeff Dike <jdike@linux.intel.com>
Cc: WANG Cong <xiyou.wangcong@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 966f1d8f

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

+3 −2
Original line number Diff line number Diff line 
/* 

 * Copyright (C) 2000 Jeff Dike (jdike@karaya.com)

 * Copyright (C) 2000 - 2008 Jeff Dike (jdike@{addtoit,linux.intel}.com)

 * Licensed under the GPL

 */
@@ -18,7 +18,8 @@ extern syscall_handler_t old_mmap_i386; 
extern syscall_handler_t *sys_call_table[];



#define EXECUTE_SYSCALL(syscall, regs) \

	((long (*)(struct syscall_args)) (*sys_call_table[syscall]))(SYSCALL_ARGS(&regs->regs))

	((long (*)(struct syscall_args)) \

	 (*sys_call_table[syscall]))(SYSCALL_ARGS(&regs->regs))



extern long sys_mmap2(unsigned long addr, unsigned long len,

		      unsigned long prot, unsigned long flags,

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

+0 −9
Original line number Diff line number Diff line
@@ -17,16 +17,7 @@ 
#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

+0 −2
Original line number Diff line number Diff line
@@ -30,6 +30,4 @@ 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 (UM_NR_syscall_max + 1)



#endif

arch/um/kernel/skas/syscall.c

+3 −0
Original line number Diff line number Diff line
@@ -9,6 +9,9 @@ 
#include "sysdep/ptrace.h"

#include "sysdep/syscalls.h"



extern int syscall_table_size;

#define NR_syscalls (syscall_table_size / sizeof(void *))



void handle_syscall(struct uml_pt_regs *r)

{

	struct pt_regs *regs = container_of(r, struct pt_regs, regs);

arch/um/sys-i386/sys_call_table.S

+5 −0
Original line number Diff line number Diff line
@@ -9,4 +9,9 @@ 


#define old_mmap old_mmap_i386



.section .rodata,"a"



#include "../../x86/kernel/syscall_table_32.S"



ENTRY(syscall_table_size)

.long .-sys_call_table