[Xen-users] How do I upgrade from 2.6.18 to 2.6.18-4?

["Chris Fanning" <christopher.fanning@xxxxxxxxx>]

Hi,

How do I upgrade from 2.6.18 to 2.6.18-4?

I have tried this
download http://www.kernel.org/pub/linux/kernel/v2.6/patch-2.6.18.4.bz2

cd /usr/src/xen-3.1.0-src/linux-2.6.18-xen
patch -p1 < patch-2.6.18.4

This gave me two hunk errors.
1. patching file Makefile
Hunk #1 FAILED at 1.
Hunk #2 succeeded at 895 (offset 1 line).
Hunk #3 succeeded at 1080 (offset 1 line).
1 out of 3 hunks FAILED -- saving rejects to file Makefile.rej

more Makefile.rej
***************
*** 1,7 ****
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 18
- EXTRAVERSION =
 NAME=Avast! A bilge rat!

 # *DOCUMENTATION*
--- 1,7 ----
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 18
+ EXTRAVERSION = .4
 NAME=Avast! A bilge rat!

 # *DOCUMENTATION*

2. patching file net/core/skbuff.c
Hunk #1 succeeded at 643 (offset 5 lines).
Hunk #2 FAILED at 1951.
Hunk #3 FAILED at 1962.
2 out of 3 hunks FAILED -- saving rejects to file net/core/skbuff.c.rej

more net/core/skbuff.c.rej
*************** struct sk_buff *skb_segment(struct sk_bu
*** 1950,1956 ****
       do {
               struct sk_buff *nskb;
               skb_frag_t *frag;
-               int hsize, nsize;
               int k;
               int size;

--- 1951,1957 ----
       do {
               struct sk_buff *nskb;
               skb_frag_t *frag;
+               int hsize;
               int k;
               int size;

*************** struct sk_buff *skb_segment(struct sk_bu
*** 1961,1971 ****
               hsize = skb_headlen(skb) - offset;
               if (hsize < 0)
                       hsize = 0;
-               nsize = hsize + doffset;
-               if (nsize > len + doffset || !sg)
-                       nsize = len + doffset;

-               nskb = alloc_skb(nsize + headroom, GFP_ATOMIC);
               if (unlikely(!nskb))
                       goto err;

--- 1962,1971 ----
               hsize = skb_headlen(skb) - offset;
               if (hsize < 0)
                       hsize = 0;
+               if (hsize > len || !sg)
+                       hsize = len;

+               nskb = alloc_skb(hsize + doffset + headroom, GFP_ATOMIC);
               if (unlikely(!nskb))
                       goto err;



then I proceeded anyway
make KERNELS="linux-2.6-xen" dist
and installed it with ./install.sh

I followed that with
cd /boot
mkinitramfs -o initrd.img-xen.3.1.0 2.6.18-xen
depmod  2.6.18-xen

Now on reboot the modules aren't loading complaining about unknown symbols, etc.
So I've done something (or somethings) wrong.

What is the correct proceedure?

Thanks.
Chris.

_______________________________________________
Xen-users mailing list
Xen-users@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-users