tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds eeb94855 1d87b0d3

+5 -3
unified split
+5 -3
arch/x86/ia32/ia32entry.S
··· 418 418 orl $TS_COMPAT,TI_status(%r10) 419 419 testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10) 420 420 jnz ia32_tracesys 421 - ia32_do_syscall: 422 421 cmpl $(IA32_NR_syscalls-1),%eax 423 - ja int_ret_from_sys_call /* ia32_tracesys has set RAX(%rsp) */ 422 + ja ia32_badsys 423 + ia32_do_call: 424 424 IA32_ARG_FIXUP 425 425 call *ia32_sys_call_table(,%rax,8) # xxx: rip relative 426 426 ia32_sysret: ··· 435 435 call syscall_trace_enter 436 436 LOAD_ARGS32 ARGOFFSET /* reload args from stack in case ptrace changed it */ 437 437 RESTORE_REST 438 - jmp ia32_do_syscall 438 + cmpl $(IA32_NR_syscalls-1),%eax 439 + ja int_ret_from_sys_call /* ia32_tracesys has set RAX(%rsp) */ 440 + jmp ia32_do_call 439 441 END(ia32_syscall) 440 442 441 443 ia32_badsys: