Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 62474 - nvidia-kernel-1.0.6111 confilcts with mm-sources-2.6.9_rc1-r2
Summary: nvidia-kernel-1.0.6111 confilcts with mm-sources-2.6.9_rc1-r2
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: [OLD] Core system (show other bugs)
Hardware: All Linux
: High normal (vote)
Assignee: Gentoo X packagers
URL:
Whiteboard:
Keywords:
: 64820 (view as bug list)
Depends on:
Blocks:
 
Reported: 2004-08-31 22:45 UTC by augury@vampares.org
Modified: 2004-10-04 04:08 UTC (History)
2 users (show)

See Also:
Package list:
Runtime testing required: ---


Attachments
pci-find-class-2.6.9-changes.patch (pci-find-class-2.6.9-changes.patch,1.03 KB, patch)
2004-09-01 11:10 UTC, Simone Piunno
Details | Diff
nvidia-kernel-1.0.6111-r1.ebuild (nvidia-kernel-1.0.6111-r1.ebuild,3.76 KB, text/plain)
2004-09-14 14:21 UTC, Sebastian B. Otaegui
Details
fix_pci_find_class.patch (fix_pci_find_class.patch,1.35 KB, patch)
2004-09-14 14:22 UTC, Sebastian B. Otaegui
Details | Diff
nvidia-kernel-1.0.6111-r1.ebuild (nvidia-kernel-1.0.6111-r1.ebuild,3.97 KB, text/plain)
2004-09-14 14:41 UTC, Sebastian B. Otaegui
Details
Patch for portage (pci_class_changes.patch,2.83 KB, patch)
2004-09-14 19:21 UTC, Andrew Bevitt
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description augury@vampares.org 2004-08-31 22:45:09 UTC
nvidia-kernel-1.0.6111 confilcts with mm-sources-2.6.9_rc1-r2

mm-sources patch renames pci_find_class to pci_get_class
this change has to be made in nvidia kernel mod source as well or fails with undefined symbol pci_find_class
all instances are in file nv.c

Reproducible: Always
Steps to Reproduce:
1.
2.
3.
Comment 1 Simone Piunno 2004-09-01 11:10:21 UTC
Created attachment 38695 [details, diff]
pci-find-class-2.6.9-changes.patch

Please apply this one, it works for me.
Comment 2 Andrew Bevitt 2004-09-02 03:05:30 UTC
On the todo list for tomorrow
Comment 3 Heiko Wundram 2004-09-02 17:40:44 UTC
I did the patching manually (didn't use the attached patch), but changing pci_find_class to pci_get_class in nv.c works fine for me too (just as a confirmation).
Comment 4 Andrew Bevitt 2004-09-05 17:20:36 UTC
Is this backwards compatible, because it doesnt look like it here...

Need a different solution if its not
Comment 5 Sebastian B. Otaegui 2004-09-14 14:21:47 UTC
Created attachment 39609 [details]
nvidia-kernel-1.0.6111-r1.ebuild

I have added the USE flag pci_patch, it makes the driver use or not use of the
pci_find/pci_get patch
Comment 6 Sebastian B. Otaegui 2004-09-14 14:22:34 UTC
Created attachment 39610 [details, diff]
fix_pci_find_class.patch

This is the patch that i use.
Comment 7 Sebastian B. Otaegui 2004-09-14 14:41:11 UTC
Created attachment 39612 [details]
nvidia-kernel-1.0.6111-r1.ebuild

Warns about proper kernel version.
Comment 8 Andrew Bevitt 2004-09-14 19:21:51 UTC
Created attachment 39625 [details, diff]
Patch for portage

Can you all please try out this patch.

It should (and to my testing does) maintian backwards compatibility, which is
_VERY_ important.
Comment 9 Christopher Sidebottom 2004-09-16 11:29:05 UTC
added myself to cc
Comment 10 Christopher Sidebottom 2004-09-19 18:02:31 UTC
http://svn.esuna.co.uk/esuna/damouse-portage/media-video/nvidia-kernel/
Subversion tree of (I think) working ebuild and patches

-DaMouse
Comment 11 Andrew Bevitt 2004-09-22 17:07:27 UTC
*** Bug 64820 has been marked as a duplicate of this bug. ***
Comment 12 Andrew Bevitt 2004-09-22 17:21:27 UTC
I would like to add the patch posted here, and the vmalloc one in the repositor Christopher linked to, too the portage tree, but I do need some feedback on working... 

I'm also aware that the patch I posted above is slightly incomplete (thanks nvidia devs) needing to call pci_dev_put() but thats a future point, it will work without it aswell (I think).

Test please :)
Comment 13 Martin Schlemmer (RETIRED) gentoo-dev 2004-09-24 01:41:11 UTC
Poo, I was lazy and did not check here, or did a proper patch like I did for
sysfs back then.  Hope you do not mind that I added something that just works
for the time being until you guys sort a more general patch out ...
Comment 14 Andrew Bevitt 2004-10-04 04:08:58 UTC
Fixed in cvs now