proc 2/2: remove struct proc_dir_entry::owner

Updated SVN for Kernel versions > 2.6.29 following git commit

http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=99b76233803beab302123d243eea9e41149804f3

from Alexey Dobriyan <adobriyan@gmail.com>

git-svn-id: svn://svn.berlios.de//socketcan/trunk@964 030b6a49-0b11-0410-94ab-b0dab22257f2

diff --git a/kernel/2.6/net/can/bcm.c b/kernel/2.6/net/can/bcm.c
index 28742e614ca6f1ff037f92345125f898faf92277..73202762c2bf873de114eecf261a36cec95ddb07 100644 (file)
--- a/kernel/2.6/net/can/bcm.c
+++ b/kernel/2.6/net/can/bcm.c
@@ -1641,8 +1641,10 @@ static int __init bcm_module_init(void)
        proc_dir = proc_mkdir("can-bcm", proc_net);
 #endif
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
        if (proc_dir)
                proc_dir->owner = THIS_MODULE;
+#endif
 
        return 0;
 }

diff --git a/kernel/2.6/net/can/proc.c b/kernel/2.6/net/can/proc.c
index 3b34d8980acba3dc450507b0b60389357031e99a..d0a6ac9d9d1c7e7e4c06deb7141bfafe7debeab1 100644 (file)
--- a/kernel/2.6/net/can/proc.c
+++ b/kernel/2.6/net/can/proc.c
@@ -484,7 +484,9 @@ void can_init_proc(void)
                return;
        }
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
        can_dir->owner = THIS_MODULE;
+#endif
 
        /* own procfs entries from the AF_CAN core */
        pde_version     = can_create_proc_readentry(CAN_PROC_VERSION, 0644,