Hi,
I got the latest utrace 2.6.24 patch from website.
When I applied it to 2.6.24-rc3 kernel, got some report. Most of them
are about whitespace.
But one of them made compilation failed. kernel/exit.c
@@ -1382,12 +1305,11 @@ static int wait_task_stopped(struct task
if (unlikely(noreap)) {
uid_t uid = p->uid;
- int why = (p->ptrace & PT_PTRACED) ? CLD_TRAPPED : CLD_STOPPED;
exit_code = p->exit_code;
if (unlikely(!exit_code) || unlikely(p->exit_state))
goto bail_ref;
- return wait_noreap_copyout(p, pid, uid,
+ return wait_noreap_copyout(p, pid, uid CLD_STOPPED,
why, exit_code,
infop, ru);
The local variable why is removed. So maybe
goto bail_ref;
return wait_noreap_copyout(p, pid, uid,
+ CLD_STOPPED, exit_code,
The following is the applying log.
Regards,
Wenji
patching file arch/s390/kernel/traps.c
Hunk #2 succeeded at 339 (offset -1 lines).
patching file arch/x86/kernel/traps_64.c
Hunk #1 succeeded at 876 (offset -9 lines).
patching file kernel/exit.c
Hunk #24 FAILED at 1305.
Hunk #25 succeeded at 1367 (offset 1 line).
Hunk #27 succeeded at 1470 (offset 1 line).
Hunk #29 succeeded at 1525 (offset 1 line).
Hunk #31 succeeded at 1569 (offset 1 line).
1 out of 31 hunks FAILED -- saving rejects to file kernel/exit.c.rej
patching file Documentation/DocBook/Makefile
Hunk #1 succeeded at 9 with fuzz 2.
patching file include/linux/sched.h
Hunk #1 succeeded at 915 (offset -4 lines).
Hunk #3 succeeded at 977 (offset -4 lines).
Hunk #5 succeeded at 1121 (offset -4 lines).
Hunk #7 succeeded at 1314 (offset -4 lines).
