Hi, I'm trying to patch this kernel (2.6.26) with the patch provided by 
Guillaume Lecerf for current kernel.

I'm stuck with patching cfi_util.c file, as it's very different. Can 
somebody help?

Patch and cfi_util.c attached!