phc-intel-0.3.2-4 patch fails with 2.6.30-rc3-git1

If you have trouble with PHC you can ask and hope for help here.
Post Reply
shze
Posts: 3
Joined: Sun 26. Apr 2009, 01:57

phc-intel-0.3.2-4 patch fails with 2.6.30-rc3-git1

Post by shze » Sun 26. Apr 2009, 02:15

I downloaded the most recent intel patch 0.3.2-4 from the forum and tried to patch the latest vanilla git kernel. But patching fails with:

# patch -p1 < ../../phc-intel-0.3.2-4/inc/2.6.30/linux-phc-0.3.2.patch
patching file arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
Hunk #2 FAILED at 64.
Hunk #3 succeeded at 122 (offset 4 lines).
Hunk #4 succeeded at 791 (offset 2 lines).
Hunk #5 succeeded at 810 (offset 2 lines).
1 out of 5 hunks FAILED -- saving rejects to file arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c.rej

I attached acpi-cpufreq.c.rej as tar archive.

Is there a fix? I am happy to test.

Regards,
Sten
Attachments
acpi-cpufreq.tar
(10 KiB) Downloaded 246 times

shze
Posts: 3
Joined: Sun 26. Apr 2009, 01:57

Re: phc-intel-0.3.2-4 patch fails with 2.6.30-rc3-git1

Post by shze » Sun 26. Apr 2009, 04:10

To me it looks like the following two commits changed struct acpi_cpufreq_data, so that the patch does not apply anymore:

http://git.kernel.org/?p=linux/kernel/g ... a1419e2b61
http://git.kernel.org/?p=linux/kernel/g ... 9ae3259cda

But because I don't know what the code really does, I have unfortunately no idea how to fix it. Hopefully somebody else does. :)

Sten

Update:
Applying the old patch to the new acpi-cpufreq.c manually resulted in the attached tar file. It is completely untested. No guarantee that is compiles or even work. I will test it tomorrow and update here again.
Attachments
phc-intel-0.3.2-2.6.30rc3.tar
(20 KiB) Downloaded 245 times

the-fallen
Administrator
Posts: 346
Joined: Wed 9. Jul 2008, 19:57

Re: phc-intel-0.3.2-4 patch fails with 2.6.30-rc3-git1

Post by the-fallen » Sun 26. Apr 2009, 09:47

I will add support for newer .30 Kernel later this day (currently testing it).

shze
Posts: 3
Joined: Sun 26. Apr 2009, 01:57

Re: phc-intel-0.3.2-4 patch fails with 2.6.30-rc3-git1

Post by shze » Mon 27. Apr 2009, 00:20

I modified my patch, and it seems to work now, tested on 2.6.30-rc3-git1. I attached the latest version of it.

Sten




[edit by the-fallen: removed attachment - read below]

the-fallen
Administrator
Posts: 346
Joined: Wed 9. Jul 2008, 19:57

Re: phc-intel-0.3.2-4 patch fails with 2.6.30-rc3-git1

Post by the-fallen » Mon 27. Apr 2009, 07:33

Thanks for your work, seems that both, you and I did the same to the same time :)

I am sorry but I remove your file attachment. May confuse some users.
If you like you are free and extremely welcome to adapt the patches to future versions and I will add them to the off-tree package.
I just need to know :)

tntprog
Posts: 16
Joined: Wed 7. Jan 2009, 02:23

Re: phc-intel-0.3.2-4 patch fails with 2.6.30-rc3-git1

Post by tntprog » Tue 28. Apr 2009, 19:10

If you like you are free and extremely welcome to adapt the patches to future versions and I will add them to the off-tree package.
It would be great if it could be patched for kernel 2.6.26 because it's the kernel used in the latest stable Debian ;)

n3Cre0
Posts: 13
Joined: Sun 9. Nov 2008, 20:54

Re: phc-intel-0.3.2-4 patch fails with 2.6.30-rc3-git1

Post by n3Cre0 » Wed 29. Apr 2009, 09:26

tntprog wrote:
If you like you are free and extremely welcome to adapt the patches to future versions and I will add them to the off-tree package.
It would be great if it could be patched for kernel 2.6.26 because it's the kernel used in the latest stable Debian ;)
You can find the 2.6.26 patch here: http://www.linux-phc.org/forum/viewtopic.php?f=13&t=2. Scroll down to
################################################
Single patches (for older Kernel Versions)
################################################


0.3.2

tntprog
Posts: 16
Joined: Wed 7. Jan 2009, 02:23

Re: phc-intel-0.3.2-4 patch fails with 2.6.30-rc3-git1

Post by tntprog » Fri 1. May 2009, 03:25

n3Cre0 wrote:
tntprog wrote:
If you like you are free and extremely welcome to adapt the patches to future versions and I will add them to the off-tree package.
It would be great if it could be patched for kernel 2.6.26 because it's the kernel used in the latest stable Debian ;)
You can find the 2.6.26 patch here: http://www.linux-phc.org/forum/viewtopic.php?f=13&t=2. Scroll down to
################################################
Single patches (for older Kernel Versions)
################################################


0.3.2
Indeed, I meant the module outside the kernel, not the patch for the kernel.

Post Reply