Sorry about the first two patches they both apply on top
of 2.4.17-pre7. I have attached both of them again I case ...