x11-drivers/nvidia-drivers/files/linux-kernel-proc-owner.patch

   1 --- usr/src/nv/nv.c.orig        2009-06-29 00:14:45.000000000 +0200
   2 +++ usr/src/nv/nv.c     2009-06-29 00:15:06.000000000 +0200
   3 @@ -374,7 +374,6 @@
   4  /* character driver entry points */
   5
   6  static struct file_operations nv_fops = {
   7 -    .owner     = THIS_MODULE,
   8      .poll      = nv_kern_poll,
   9      .ioctl     = nv_kern_ioctl,
  10  #if defined(HAVE_UNLOCKED_IOCTL)
  11 @@ -589,14 +588,6 @@
  12      if (!proc_nvidia_warnings)
  13          goto failed;
  14
  15 -    /*
  16 -     * Set the module owner to ensure that the reference
  17 -     * count reflects accesses to the proc files.
  18 -     */
  19 -    proc_nvidia->owner = THIS_MODULE;
  20 -    proc_nvidia_cards->owner = THIS_MODULE;
  21 -    proc_nvidia_warnings->owner = THIS_MODULE;
  22 -
  23      for (j = 0; j < num_nv_devices; j++)
  24      {
  25          nvl = &nv_linux_devices[j];
  26 @@ -615,7 +606,6 @@
  27
  28          entry->data = nv;
  29          entry->read_proc = nv_kern_read_cardinfo;
  30 -        entry->owner = THIS_MODULE;
  31
  32          if (nv_find_pci_capability(dev, PCI_CAP_ID_AGP))
  33          {
  34 @@ -629,7 +619,6 @@
  35                  goto failed;
  36              }
  37
  38 -            entry->owner = THIS_MODULE;
  39              proc_nvidia_agp = entry;
  40
  41              entry = create_proc_entry("status", flags, proc_nvidia_agp);
  42 @@ -640,7 +629,6 @@
  43
  44              entry->data = nv;
  45              entry->read_proc = nv_kern_read_status;
  46 -            entry->owner = THIS_MODULE;
  47
  48              entry = create_proc_entry("host-bridge", flags, proc_nvidia_agp);
  49              if (!entry) {
  50 @@ -650,7 +638,6 @@
  51
  52              entry->data = NULL;
  53              entry->read_proc = nv_kern_read_agpinfo;
  54 -            entry->owner = THIS_MODULE;
  55
  56              entry = create_proc_entry("card", flags, proc_nvidia_agp);
  57              if (!entry) {
  58 @@ -660,7 +647,6 @@
  59
  60              entry->data = nv;
  61              entry->read_proc = nv_kern_read_agpinfo;
  62 -            entry->owner = THIS_MODULE;
  63          }
  64
  65          NV_PCI_DEV_PUT(dev);
  66 @@ -671,14 +657,12 @@
  67          goto failed;
  68
  69      entry->read_proc = nv_kern_read_version;
  70 -    entry->owner = THIS_MODULE;
  71
  72      entry = create_proc_entry("registry", flags, proc_nvidia);
  73      if (!entry)
  74          goto failed;
  75
  76      entry->read_proc = nv_kern_read_registry;
  77 -    entry->owner = THIS_MODULE;
  78
  79      return;
  80
  81 @@ -705,7 +689,6 @@
  82
  83      entry->data = (void *)message;
  84      entry->read_proc = nv_kern_read_warning;
  85 -    entry->owner = THIS_MODULE;
  86  #endif
  87  }
  88
  89 --- usr/src/nv/nv-i2c.c.orig    2009-06-29 00:26:32.000000000 +0200
  90 +++ usr/src/nv/nv-i2c.c 2009-06-29 00:26:56.000000000 +0200
  91 @@ -218,8 +218,6 @@
  92  #if defined(NV_I2C_ADAPTER_HAS_DEC_USE)
  93      .dec_use           = nv_i2c_adapter_dec_use,
  94  #endif
  95 -    .client_register   = nv_i2c_adapter_register_client,
  96 -    .client_unregister = nv_i2c_adapter_unregister_client,
  97      .data              = NULL,
  98  };
  99
 100 @@ -241,8 +239,6 @@
 101      .owner             = THIS_MODULE,
 102      .algo              = &nv_i2c_algo,
 103      .algo_data         = NULL,
 104 -    .client_register   = nv_i2c_adapter_register_client,
 105 -    .client_unregister = nv_i2c_adapter_unregister_client,
 106  };
 107
 108  #endif // defined(KERNEL_2_4)