Attachment #194304 for bug #273539




#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 (nvos_find_agp_capability(dev)) {
            /*
             * Create the /proc/driver/nvidia/agp/{status,host-bridge,card}

                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) {
                NV_PCI_DEV_PUT(dev);


            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;

failed:


    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 273539

Lines 16-21 Link Here

(-)o/usr/src/nv/nv.c (-7 / +19 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 607-616 Link Here
607	* Set the module owner to ensure that the reference	608	* Set the module owner to ensure that the reference
608	* count reflects accesses to the proc files.	609	* count reflects accesses to the proc files.
609	*/	610	*/
		611	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
610	proc_nvidia->owner = THIS_MODULE;	612	proc_nvidia->owner = THIS_MODULE;
611	proc_nvidia_cards->owner = THIS_MODULE;	613	proc_nvidia_cards->owner = THIS_MODULE;
612	proc_nvidia_warnings->owner = THIS_MODULE;	614	proc_nvidia_warnings->owner = THIS_MODULE;
613		615	#endif
614	for (j = 0; j < num_nv_devices; j++)	616	for (j = 0; j < num_nv_devices; j++)
615	{	617	{
616	nvl = &nv_linux_devices[j];	618	nvl = &nv_linux_devices[j];
Lines 629-636 Link Here
629		631
630	entry->data = nv;	632	entry->data = nv;
631	entry->read_proc = nv_kern_read_cardinfo;	633	entry->read_proc = nv_kern_read_cardinfo;
		634	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
632	entry->owner = THIS_MODULE;	635	entry->owner = THIS_MODULE;
633		636	#endif
634	if (nvos_find_agp_capability(dev)) {	637	if (nvos_find_agp_capability(dev)) {
635	/*	638	/*
636	* Create the /proc/driver/nvidia/agp/{status,host-bridge,card}	639	* Create the /proc/driver/nvidia/agp/{status,host-bridge,card}
Lines 641-648 Link Here
641	NV_PCI_DEV_PUT(dev);	644	NV_PCI_DEV_PUT(dev);
642	goto failed;	645	goto failed;
643	}	646	}
644		647	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
645	entry->owner = THIS_MODULE;	648	entry->owner = THIS_MODULE;
		649	#endif
646	proc_nvidia_agp = entry;	650	proc_nvidia_agp = entry;
647		651
648	entry = create_proc_entry("status", flags, proc_nvidia_agp);	652	entry = create_proc_entry("status", flags, proc_nvidia_agp);
Lines 653-660 Link Here
653		657
654	entry->data = nv;	658	entry->data = nv;
655	entry->read_proc = nv_kern_read_status;	659	entry->read_proc = nv_kern_read_status;
		660	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
656	entry->owner = THIS_MODULE;	661	entry->owner = THIS_MODULE;
657		662	#endif
658	entry = create_proc_entry("host-bridge", flags, proc_nvidia_agp);	663	entry = create_proc_entry("host-bridge", flags, proc_nvidia_agp);
659	if (!entry) {	664	if (!entry) {
660	NV_PCI_DEV_PUT(dev);	665	NV_PCI_DEV_PUT(dev);
Lines 663-670 Link Here
663		668
664	entry->data = NULL;	669	entry->data = NULL;
665	entry->read_proc = nv_kern_read_agpinfo;	670	entry->read_proc = nv_kern_read_agpinfo;
		671	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
666	entry->owner = THIS_MODULE;	672	entry->owner = THIS_MODULE;
667		673	#endif
668	entry = create_proc_entry("card", flags, proc_nvidia_agp);	674	entry = create_proc_entry("card", flags, proc_nvidia_agp);
669	if (!entry) {	675	if (!entry) {
670	NV_PCI_DEV_PUT(dev);	676	NV_PCI_DEV_PUT(dev);
Lines 673-679 Link Here
673		679
674	entry->data = nv;	680	entry->data = nv;
675	entry->read_proc = nv_kern_read_agpinfo;	681	entry->read_proc = nv_kern_read_agpinfo;
		682	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
676	entry->owner = THIS_MODULE;	683	entry->owner = THIS_MODULE;
		684	#endif
677	}	685	}
678		686
679	NV_PCI_DEV_PUT(dev);	687	NV_PCI_DEV_PUT(dev);
Lines 684-698 Link Here
684	goto failed;	692	goto failed;
685		693
686	entry->read_proc = nv_kern_read_version;	694	entry->read_proc = nv_kern_read_version;
		695	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
687	entry->owner = THIS_MODULE;	696	entry->owner = THIS_MODULE;
688		697	#endif
689	entry = create_proc_entry("registry", flags, proc_nvidia);	698	entry = create_proc_entry("registry", flags, proc_nvidia);
690	if (!entry)	699	if (!entry)
691	goto failed;	700	goto failed;
692		701
693	entry->read_proc = nv_kern_read_registry;	702	entry->read_proc = nv_kern_read_registry;
		703	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
694	entry->owner = THIS_MODULE;	704	entry->owner = THIS_MODULE;
695		705	#endif
696	return;	706	return;
697		707
698	failed:	708	failed:
Lines 718-725 Link Here
718		728
719	entry->data = (void *)message;	729	entry->data = (void *)message;
720	entry->read_proc = nv_kern_read_warning;	730	entry->read_proc = nv_kern_read_warning;
		731	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
721	entry->owner = THIS_MODULE;	732	entry->owner = THIS_MODULE;
722	#endif	733	#endif
		734	#endif
723	}	735	}
724		736
725	#ifdef CONFIG_PROC_FS	737	#ifdef CONFIG_PROC_FS