Attachment #189557 for bug #267594




#include "os-agp.h"
#include "nv-vm.h"
#include "nv-reg.h"
#include <linux/version.h>

#ifdef MODULE_ALIAS_CHARDEV_MAJOR
MODULE_ALIAS_CHARDEV_MAJOR(NV_MAJOR_DEVICE_NUMBER);

     * Set the module owner to ensure that the reference
     * count reflects accesses to the proc files.
     */
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
    proc_nvidia->owner = THIS_MODULE;
    proc_nvidia_cards->owner = THIS_MODULE;
    proc_nvidia_warnings->owner = THIS_MODULE;
#endif
    for (j = 0; j < num_nv_devices; j++)
    {
        nvl = &nv_linux_devices[j];


        entry->data = nv;
        entry->read_proc = nv_kern_read_cardinfo;
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
        entry->owner = THIS_MODULE;
#endif
        if (nv_find_pci_capability(dev, PCI_CAP_ID_AGP))
        {
            /*

                NV_PCI_DEV_PUT(dev);
                goto failed;
            }
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
            entry->owner = THIS_MODULE; 
#endif
            proc_nvidia_agp = entry;

            entry = create_proc_entry("status", flags, proc_nvidia_agp);


            entry->data = nv;
            entry->read_proc = nv_kern_read_status;
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
            entry->owner = THIS_MODULE;  
#endif
            entry = create_proc_entry("host-bridge", flags, proc_nvidia_agp);
            if (!entry) {
                NV_PCI_DEV_PUT(dev);


            entry->data = NULL;
            entry->read_proc = nv_kern_read_agpinfo;
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
            entry->owner = THIS_MODULE; 
#endif

            entry = create_proc_entry("card", flags, proc_nvidia_agp);
            if (!entry) {


            entry->data = nv;
            entry->read_proc = nv_kern_read_agpinfo;
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
            entry->owner = THIS_MODULE; 
#endif
        }

        NV_PCI_DEV_PUT(dev);

        goto failed;

    entry->read_proc = nv_kern_read_version;
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
    entry->owner = THIS_MODULE; 
#endif
    entry = create_proc_entry("registry", flags, proc_nvidia);
    if (!entry)
        goto failed;

    entry->read_proc = nv_kern_read_registry;
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
    entry->owner = THIS_MODULE; 
#endif

    return;



    entry->data = (void *)message;
    entry->read_proc = nv_kern_read_warning;
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
    entry->owner = THIS_MODULE;
#endif
#endif
}

#ifdef CONFIG_PROC_FS

Return to bug 267594

Lines 16-21 Link Here

(-)nv.c (-11 / +25 lines)
16	#include "os-agp.h"	16	#include "os-agp.h"
17	#include "nv-vm.h"	17	#include "nv-vm.h"
18	#include "nv-reg.h"	18	#include "nv-reg.h"
		19	#include <linux/version.h>
19		20
20	#ifdef MODULE_ALIAS_CHARDEV_MAJOR	21	#ifdef MODULE_ALIAS_CHARDEV_MAJOR
21	MODULE_ALIAS_CHARDEV_MAJOR(NV_MAJOR_DEVICE_NUMBER);	22	MODULE_ALIAS_CHARDEV_MAJOR(NV_MAJOR_DEVICE_NUMBER);
Lines 593-602 Link Here
593	* Set the module owner to ensure that the reference	594	* Set the module owner to ensure that the reference
594	* count reflects accesses to the proc files.	595	* count reflects accesses to the proc files.
595	*/	596	*/
		597	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
596	proc_nvidia->owner = THIS_MODULE;	598	proc_nvidia->owner = THIS_MODULE;
597	proc_nvidia_cards->owner = THIS_MODULE;	599	proc_nvidia_cards->owner = THIS_MODULE;
598	proc_nvidia_warnings->owner = THIS_MODULE;	600	proc_nvidia_warnings->owner = THIS_MODULE;
599		601	#endif
600	for (j = 0; j < num_nv_devices; j++)	602	for (j = 0; j < num_nv_devices; j++)
601	{	603	{
602	nvl = &nv_linux_devices[j];	604	nvl = &nv_linux_devices[j];
Lines 615-622 Link Here
615		617
616	entry->data = nv;	618	entry->data = nv;
617	entry->read_proc = nv_kern_read_cardinfo;	619	entry->read_proc = nv_kern_read_cardinfo;
		620	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
618	entry->owner = THIS_MODULE;	621	entry->owner = THIS_MODULE;
619		622	#endif
620	if (nv_find_pci_capability(dev, PCI_CAP_ID_AGP))	623	if (nv_find_pci_capability(dev, PCI_CAP_ID_AGP))
621	{	624	{
622	/*	625	/*
Lines 628-635 Link Here
628	NV_PCI_DEV_PUT(dev);	631	NV_PCI_DEV_PUT(dev);
629	goto failed;	632	goto failed;
630	}	633	}
631		634	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
632	entry->owner = THIS_MODULE;	635	entry->owner = THIS_MODULE;
		636	#endif
633	proc_nvidia_agp = entry;	637	proc_nvidia_agp = entry;
634		638
635	entry = create_proc_entry("status", flags, proc_nvidia_agp);	639	entry = create_proc_entry("status", flags, proc_nvidia_agp);
Lines 640-647 Link Here
640		644
641	entry->data = nv;	645	entry->data = nv;
642	entry->read_proc = nv_kern_read_status;	646	entry->read_proc = nv_kern_read_status;
643	entry->owner = THIS_MODULE;	647	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
644		648	entry->owner = THIS_MODULE;
		649	#endif
645	entry = create_proc_entry("host-bridge", flags, proc_nvidia_agp);	650	entry = create_proc_entry("host-bridge", flags, proc_nvidia_agp);
646	if (!entry) {	651	if (!entry) {
647	NV_PCI_DEV_PUT(dev);	652	NV_PCI_DEV_PUT(dev);
Lines 650-656 Link Here
650		655
651	entry->data = NULL;	656	entry->data = NULL;
652	entry->read_proc = nv_kern_read_agpinfo;	657	entry->read_proc = nv_kern_read_agpinfo;
653	entry->owner = THIS_MODULE;	658	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
		659	entry->owner = THIS_MODULE;
		660	#endif
654		661
655	entry = create_proc_entry("card", flags, proc_nvidia_agp);	662	entry = create_proc_entry("card", flags, proc_nvidia_agp);
656	if (!entry) {	663	if (!entry) {
Lines 660-666 Link Here
660		667
661	entry->data = nv;	668	entry->data = nv;
662	entry->read_proc = nv_kern_read_agpinfo;	669	entry->read_proc = nv_kern_read_agpinfo;
663	entry->owner = THIS_MODULE;	670	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
		671	entry->owner = THIS_MODULE;
		672	#endif
664	}	673	}
665		674
666	NV_PCI_DEV_PUT(dev);	675	NV_PCI_DEV_PUT(dev);
Lines 671-684 Link Here
671	goto failed;	680	goto failed;
672		681
673	entry->read_proc = nv_kern_read_version;	682	entry->read_proc = nv_kern_read_version;
674	entry->owner = THIS_MODULE;	683	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
675		684	entry->owner = THIS_MODULE;
		685	#endif
676	entry = create_proc_entry("registry", flags, proc_nvidia);	686	entry = create_proc_entry("registry", flags, proc_nvidia);
677	if (!entry)	687	if (!entry)
678	goto failed;	688	goto failed;
679		689
680	entry->read_proc = nv_kern_read_registry;	690	entry->read_proc = nv_kern_read_registry;
681	entry->owner = THIS_MODULE;	691	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
		692	entry->owner = THIS_MODULE;
		693	#endif
682		694
683	return;	695	return;
684		696
Lines 705-712 Link Here
705		717
706	entry->data = (void *)message;	718	entry->data = (void *)message;
707	entry->read_proc = nv_kern_read_warning;	719	entry->read_proc = nv_kern_read_warning;
		720	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
708	entry->owner = THIS_MODULE;	721	entry->owner = THIS_MODULE;
709	#endif	722	#endif
		723	#endif
710	}	724	}
711		725
712	#ifdef CONFIG_PROC_FS	726	#ifdef CONFIG_PROC_FS