Re: patching 2.4.29 with fr1

Hegedus Gabor <[email protected]> wrote:
> Anybody tried to patch kernel 2.4.29 with fr1 patch? I need it couse I

Is there a problem?

> use raid1 to boot, root, home and I want to use fr1 over this with image
> files.
> 
> I try to patch 2.4.24 too: Then a compille:

Well, I would stick to only one of those!

> --------------------------------------------
> drivers/md/mddev.o(.text+0x3810): In function `raid1_sync_request':
> : undefined reference to `md_throttle'

That's fine. md_throttle is defined in md.c (as you can see from the
patch!).  I don't quite know what "mddev.o" is nor why you should be
compiling it. Perhaps you can fill me in on that. 

  --- linux-2.4.24-uml/drivers/md/md.c.orig       Sun Sep 19 16:56:33 2004
  +++ linux-2.4.24-uml/drivers/md/md.c    Sun Sep 19 16:56:38 2004
  ...
  @@ -108,6 +123,10 @@
  ...
  +#ifdef MD_BITMAP_SUPPORT
  +/* PTB md_throttle permits speed calculation adjustments from personality */
  +static atomic_t md_throttle[MAX_MD_DEVS];
  +#endif /* MD_BITMAP_SUPPORT */

But plainly if it (whatever "it" is) wants md_throttle, then you want to
remove the "static", and/or possibly export the symbol formally,
depending on precisely what the symbol is needed for. I guess removing
the "static" will be enough.

If it is this line in the Makefile:

 O_TARGET        := mddev.o

Then I'm afraid I don't know what O_TARGET signifies. Could it be
something compiled into the kernel? There is nothing that obviously
will make mddev.o in the Makefile!

Perhaps you can enlighten me as to what mddev.o is, how it is made, and
what role it plays.


> make: *** [vmlinux] Error 1

Looks like you are trying to compile something into the kernel.
Whatever it is wants md_throttle, so give it it!

> And then patch the 2.4.29:

What was wrong with 2.4.24?


> --------------------------
> 
> uml-rg-fw2:/usr/src/linux-2.4.24# uml-rg-fw2:/usr/src/linux-2.4.29#
> patch -p1 < ../fr1-2.15b/patches/linux-2.4.generic.patch
> patching file drivers/md/md.c
> Hunk #12 succeeded at 3607 with fuzz 1.
> Hunk #16 succeeded at 3745 (offset -3 lines).
> Hunk #17 succeeded at 3742 (offset -6 lines).
> Hunk #18 succeeded at 4334 with fuzz 2.
> patching file drivers/md/raid1.c
> Hunk #4 succeeded at 426 (offset 4 lines).
> Hunk #5 succeeded at 526 (offset 4 lines).
> Hunk #6 succeeded at 615 (offset 10 lines).
> Hunk #7 succeeded at 624 with fuzz 1 (offset 10 lines).
> Hunk #8 succeeded at 648 (offset 10 lines).
> Hunk #9 FAILED at 722.

Well, one failure.

> Hunk #10 succeeded at 770 (offset 16 lines).
> Hunk #11 FAILED at 796.

Two.

> Hunk #12 succeeded at 896 (offset 20 lines).
> Hunk #13 succeeded at 914 (offset 21 lines).
> Hunk #14 succeeded at 965 (offset 21 lines).
> Hunk #15 succeeded at 1050 (offset 21 lines).
> Hunk #16 succeeded at 1126 (offset 26 lines).
> Hunk #17 succeeded at 1221 (offset 29 lines).
> Hunk #18 succeeded at 1397 (offset 29 lines).
> Hunk #19 succeeded at 1410 (offset 29 lines).
> Hunk #20 succeeded at 1446 (offset 29 lines).
> Hunk #21 FAILED at 1694.

Three.

> Hunk #22 succeeded at 1720 (offset 32 lines).
> Hunk #23 succeeded at 1752 (offset 32 lines).
> Hunk #24 succeeded at 1774 (offset 32 lines).
> Hunk #25 FAILED at 1791.

Four.

> Hunk #26 succeeded at 1886 (offset 35 lines).
> Hunk #27 succeeded at 1941 (offset 35 lines).
> Hunk #28 succeeded at 1994 (offset 35 lines).
> Hunk #29 succeeded at 2164 (offset 35 lines).
> Hunk #30 succeeded at 2232 (offset 35 lines).
> Hunk #31 succeeded at 2294 (offset 35 lines).
> Hunk #32 succeeded at 2327 (offset 35 lines).
> 4 out of 32 hunks FAILED -- saving rejects to file
> drivers/md/raid1.c.rej
> patching file drivers/md/bitmap.c
> patching file drivers/md/bitmap.h
> patching file include/linux/raid/raid1.h
> patching file include/linux/raid/md_p.h
> patching file drivers/md/Makefile
> patching file drivers/md/Config.in
> patching file Documentation/Configure.help
> Hunk #1 succeeded at 2050 (offset 3 lines).

All OK there. 

What's the problem, precisely?  Are the rejects particularly difficult
to fix?  What are they?

Anyway, when you have fixed them, post the corrections and I'll be glad
to incorporate them!

Peter