#55 Patch for 2.6.22

[Mauro Tassinari]

Patch for 2.6.22

[Mauro Tassinari]

Logged In: YES
user_id=80373
Originator: YES

apply to ibcs_3_3

[dyz]

Logged In: YES
user_id=1895920
Originator: NO

I'm probably doing something wrong, but i would greatly appreciate some help. I downloaded IBCS_3_3 to a directory and successfully ran the KSL21patch like so:

#zcat KSL21.patch.gz |patch -p1
patching file lcall/entry.S

Now as i am trying to use a 2.6.22 kernel i also tried :
# cat KSL22.patch |patch -p1
patching file lcall/entry.S
Hunk #1 FAILED at 55.
1 out of 1 hunk FAILED -- saving rejects to file lcall/entry.S.rej
patching file uw7/mmap.c
Hunk #1 FAILED at 24.
1 out of 1 hunk FAILED -- saving rejects to file uw7/mmap.c.rej

let me know if you need any more info such as posting reject files, thanks in advance

[Mauro Tassinari]

Logged In: YES
user_id=80373
Originator: YES

it is not incremental. please appy to ibcs_3_3

[dyz]

Logged In: YES
user_id=1895920
Originator: NO

If I apply the KSL22 patch to the IBCS_3_3 source I get the same error message. I just ran a quick test to verify this.

Here are the contents of lcall/entry.S.rej if this may help:
***************
*** 55,61 ****
movl %edx,%ds^M
movl %edx,%es^M
#if _KSL > 19^M
- movl $(__KERNEL_PDA),%edx^M
#if _KSL > 20^M
movl %edx,%fs^M
#else^M
--- 55,65 ----
movl %edx,%ds^M
movl %edx,%es^M
#if _KSL > 19^M
+ #if _KSL > 21^M
+ movl $(__KERNEL_PERCPU),%edx^M
+ #else^M
+ movl $(__KERNEL_PDA),%edx^M
+ #endif^M
#if _KSL > 20^M
movl %edx,%fs^M
#else^M

[dyz]

Logged In: YES
user_id=1895920
Originator: NO

If I apply the KSL22 patch to the IBCS_3_3 source I get the same error message. I just ran a quick test to verify this.

Here are the contents of lcall/entry.S.rej if this may help:
***************
*** 55,61 ****
movl %edx,%ds^M
movl %edx,%es^M
#if _KSL > 19^M
- movl $(__KERNEL_PDA),%edx^M
#if _KSL > 20^M
movl %edx,%fs^M
#else^M
--- 55,65 ----
movl %edx,%ds^M
movl %edx,%es^M
#if _KSL > 19^M
+ #if _KSL > 21^M
+ movl $(__KERNEL_PERCPU),%edx^M
+ #else^M
+ movl $(__KERNEL_PDA),%edx^M
+ #endif^M
#if _KSL > 20^M
movl %edx,%fs^M
#else^M

[Mauro Tassinari]

Logged In: YES
user_id=80373
Originator: YES

this not incremental should work.
Regards
File Added: KSL22.PATCH

[Mauro Tassinari]

KSL22.patch

[dyz]

Logged In: YES
user_id=1895920
Originator: NO

To ensure my sanity I downloaded a fresh copy of IBCS_3_3.TGZ on a different computer and tried the patch, but received the same error. Could it be that one of these are the wrong files? I've only tried this on gentoo so far, i'll try on a few other distros tonight...

[dyz]

Logged In: YES
user_id=1895920
Originator: NO

hmm... ok from ubuntu it patches... it doesnt appear to be permission related, and patch is v2.5.9 on both systems. Now I'm just curious why this wont patch on gentoo?

# cat KSL22.PATCH |patch -p1
(Stripping trailing CRs from patch.)
patching file lcall/entry.S