[pkg-nvidia-devel] Bug#575550: more about: nvidia-kernel-source: New stable release 195.36.15 available

[Joel Soete]

Deqr maintainer,

Here is what I have to change in the module src to make it works:
diff -Naur nvidia-kernel.orig/conftest.h nvidia-kernel/conftest.h
--- nvidia-kernel.orig/conftest.h       2010-03-20 16:21:35.000000000 +0000
+++ nvidia-kernel/conftest.h    2010-03-20 19:12:10.000000000 +0000
@@ -235,3 +235,12 @@
   #define NV_INIT_WORK_PRESENT
   #define NV_INIT_WORK_ARGUMENT_COUNT 3
  #endif
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
+  #define NV_ACPI_WALK_NAMESPACE_PRESENT
+  #define NV_ACPI_WALK_NAMESPACE_ARGUMENT_COUNT 7
+#else
+  #define NV_ACPI_WALK_NAMESPACE_PRESENT
+  #define NV_ACPI_WALK_NAMESPACE_ARGUMENT_COUNT 6
+#endif
+

is a mimimal stuff I had to add manually in place of 'conftest.sh' (may be is it possible to do better?)


And finaly:

diff -Naur nvidia-kernel.orig/nv-linux.h nvidia-kernel/nv-linux.h
--- nvidia-kernel.orig/nv-linux.h       2010-03-20 16:21:35.000000000 +0000
+++ nvidia-kernel/nv-linux.h    2010-03-20 19:24:38.000000000 +0000
@@ -13,7 +13,6 @@
  #define _NV_LINUX_H_

  #include "nv.h"
-#include "conftest.h"

  #ifndef AUTOCONF_INCLUDED
  #if defined(NV_GENERATED_AUTOCONF_H_PRESENT)
@@ -38,6 +37,8 @@
  #  error This driver does not support development kernels!
  #endif

+#include "conftest.h"
+
  #if defined(KERNEL_2_4)
  #define NV_KMEM_CACHE_CREATE_PRESENT
  #define NV_KMEM_CACHE_CREATE_ARGUMENT_COUNT 6
@@ -209,8 +210,8 @@
      (NV_ACPI_WALK_NAMESPACE_ARGUMENT_COUNT == 6)
  #define NV_ACPI_WALK_NAMESPACE(type, args...) acpi_walk_namespace(type, args)
  #elif (NV_ACPI_WALK_NAMESPACE_ARGUMENT_COUNT == 7)
-#define NV_ACPI_WALK_NAMESPACE(type, args...) \
-    acpi_walk_namespace(type, args, NULL)
+#define NV_ACPI_WALK_NAMESPACE(a,b,c,d,e,f) \
+    acpi_walk_namespace(a,b,c,d,NULL,e,f)
  #else
  #error "NV_ACPI_WALK_NAMESPACE_ARGUMENT_COUNT value unrecognized!"
  #endif
=== <> ===

The first part was taken from previous release.

The second is from some other proposal and the linux patch-2.6.33 reading:
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h
index e723b0f..86e9735 100644
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
@@ -47,7 +47,7 @@

  /* Current ACPICA subsystem version in YYYYMMDD format */

-#define ACPI_CA_VERSION                 0x20090903
+#define ACPI_CA_VERSION                 0x20091214

  #include "actypes.h"
  #include "actbl.h"
@@ -154,7 +154,8 @@ acpi_status
  acpi_walk_namespace(acpi_object_type type,
                     acpi_handle start_object,
                     u32 max_depth,
-                   acpi_walk_callback user_function,
+                   acpi_walk_callback pre_order_visit,
+                   acpi_walk_callback post_order_visit,
                     void *context, void **return_value);

  acpi_status
=== <> ===

and some example of change else where in the same patch:
--- a/drivers/pci/hotplug/acpiphp_ibm.c
+++ b/drivers/pci/hotplug/acpiphp_ibm.c
@@ -434,7 +434,7 @@ static int __init ibm_acpiphp_init(void)
         dbg("%s\n", __func__);

         if (acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
-                       ACPI_UINT32_MAX, ibm_find_acpi_device,
+                       ACPI_UINT32_MAX, ibm_find_acpi_device, NULL,
                         &ibm_acpi_handle, NULL) != FOUND_APCI) {
                 err("%s: acpi_walk_namespace failed\n", __func__);
                 retval = -ENODEV;
=== < among many others > ===

which seems to show that 'NULL' should be added as 5th parameter and not the 7th, though.

Hth,
	J.