Hallo David, op 19-06-12 20:17 schreef je:
Hello,
On Mon, 18 Jun 2012, Harrie Baken wrote:
Which leads eventually to a patch at http://patchwork.ozlabs.org/patch/149020/
Like Torbjörn does, I've "stalls" happening. They're driving me mad. I studied 'diff' and 'patch' to be able to apply the mentioned patch, but that stuff confuses me too much to just dare it!
In which directory should I 'patch'? Should it be /usr/src/linux-3.1.10-1.9/net? Or /usr/src/linux-3.1.10-1.9? Or /usr/src?
Is the right command to actually patch: "patch -p1< path/to/net-fix-a-potential-rcu_read_lock-imbalance-in-rt6_fill_node.patch"?
The patch is relative to a dir above the kernel-tree (i.e. the original a and the patched version under b). So, to apply the patch to your kernel-source, you need to cd to your sources
cd /usr/src/linux-3.1.10-1.9
and apply the patch while stripping the 'a/' 'b/' level of directories, i.e.:
patch -p1< /path/to/net-fix-a-potential-rcu_read_lock-imbalance-in-rt6_fill_node.patch
If you look at the --- and +++ lines in the patch, you see that '[ab]/net/ipv6/route.c', and if you are in your kernel tree you can have net/ipv6/route.c.
For how the '-p' option of patch works: you could also cd to /usr/src/linux-3.1.10-1.9/net and strip the /net/ level too by using patch -p2< /path/to/...patch or even change to /usr/src/linux-3.1.10-1.9/net/ipv6 and use patch -p3 to strip out the '/ipv6/' as well so that changes go to the file route.c in the current directory (you strip out [ab]/net/ipv6, i.e. 3 levels of directories ;)
HTH,
Yes, it helped. I patched the kernel. I mean, I gave an Enter! :) But I got a hunk or something: === patching file net/ipv6/route.c Hunk #1 FAILED at 2474. 1 out of 1 hunk FAILED -- saving rejects to file net/ipv6/route.c.rej === The .rej file shows the patch. So my conclusion is that kernel 3.1.10-1.9 was patched already, so to speak. That would mean I still will have my stalls and have to keep on searching for the cause of them. Thanks anyway - I learned how to patch! :) -- Harrie Baken - Tekstbureau TekstBaken www.tekstbaken.nl | Registered Linux-user #366560 openSUSE 12.1 -- To unsubscribe, e-mail: opensuse+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse+owner@opensuse.org