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

Commit eeb94855 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-roland 

* 'x86/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-roland:
  x86-64: fix int $0x80 -ENOSYS return
parents 1d87b0d3 c09249f8

arch/x86/ia32/ia32entry.S

+5 −3
Original line number Diff line number Diff line
@@ -418,9 +418,9 @@ ENTRY(ia32_syscall) 
	orl   $TS_COMPAT,TI_status(%r10)

	testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10)

	jnz ia32_tracesys

ia32_do_syscall:	

	cmpl $(IA32_NR_syscalls-1),%eax

	ja  int_ret_from_sys_call	/* ia32_tracesys has set RAX(%rsp) */

	ja ia32_badsys

ia32_do_call:

	IA32_ARG_FIXUP

	call *ia32_sys_call_table(,%rax,8) # xxx: rip relative

ia32_sysret:
@@ -435,7 +435,9 @@ ia32_tracesys: 
	call syscall_trace_enter

	LOAD_ARGS32 ARGOFFSET  /* reload args from stack in case ptrace changed it */

	RESTORE_REST

	jmp ia32_do_syscall

	cmpl $(IA32_NR_syscalls-1),%eax

	ja  int_ret_from_sys_call	/* ia32_tracesys has set RAX(%rsp) */

	jmp ia32_do_call

END(ia32_syscall)



ia32_badsys: