From: attriel <at...@d2...> - 2004-12-28 21:31:46
|
Amidst a large number of fuzz/offset notices, I get this when applying host-skas-2.6.9-v7 patch to my 2.6.10 kernel: patching file arch/i386/kernel/ptrace.c Hunk #2 FAILED at 359. Hunk #3 succeeded at 413 with fuzz 1 (offset 46 lines). Hunk #4 succeeded at 410 with fuzz 2 (offset -10 lines). Hunk #5 succeeded at 567 (offset 39 lines). Hunk #6 succeeded at 583 (offset -10 lines). Hunk #7 succeeded at 643 (offset 39 lines). Hunk #8 succeeded at 627 (offset -10 lines). 1 out of 8 hunks FAILED -- saving rejects to file arch/i386/kernel/ptrace.c.rej The .rej contains: more arch/i386/kernel/ptrace.c.rej *************** *** 358,363 **** } break; case PTRACE_SYSCALL: /* continue and stop at next (return from) syscall */ case PTRACE_CONT: { /* restart after signal. */ long tmp; --- 359,365 ---- } break; + case PTRACE_SYSEMU: /* continue and stop at next syscall, which will not be executed */ case PTRACE_SYSCALL: /* continue and stop at next (return from) syscall */ case PTRACE_CONT: { /* restart after signal. */ long tmp; The PTRACE_SYSCALL is now on line 410, and it looks like it should apply cleanly there (text all looks the same) -- Is there any issue with just making the change and going with it? I presume I'm hitting a patch limitation and it just isn't looking 50 lines out-of-place for it ? Thanks for the advice! --attriel |