View Single Post
Old 10-08-10, 10:08 PM   #8
ckolivas
Registered User
 
Join Date: Jan 2005
Posts: 47
Default Re: Unable to build kernel module on v190->260 on last few major kernel revisions

I've checked what was in the patched one and got the following patch:
Quote:
diff -Nurp ./pkg-history.txt ./pkg-history.txt
--- ./pkg-history.txt 2009-12-19 13:45:52.000000000 +1100
+++ ./pkg-history.txt 2010-01-25 13:39:10.000000000 +1100
@@ -4,3 +4,5 @@ NVIDIA-Linux-x86_64-195.30: Initial pack

NVIDIA-Linux-x86_64-195.30-pkg1: Added precompiled kernel interfaces for:
NVIDIA-Linux-x86_64-195.30-pkg2: Added 32 bit compatibility libraries
+NVIDIA-Linux-x86_64-195.30-pkg2-custom: Applied patch file: /home/fester/nvidia-195-2.6.33.patch.txt
+
diff -Nurp ./usr/src/nv/conftest.sh ./usr/src/nv/conftest.sh
--- ./usr/src/nv/conftest.sh 2009-12-19 13:44:00.000000000 +1100
+++ ./usr/src/nv/conftest.sh 2010-01-25 13:39:10.000000000 +1100
@@ -33,14 +33,14 @@ test_xen() {
# CONFIG_XEN and CONFIG_PARAVIRT are present, text_xen() treats
# the kernel as a stand-alone kernel.
#
- FILE="linux/autoconf.h"
+ FILE="generated/autoconf.h"

if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then
#
# We are looking at a configured source tree; verify
# that it's not a Xen kernel.
#
- echo "#include <linux/autoconf.h>
+ echo "#include <generated/autoconf.h>
#if defined(CONFIG_XEN) && !defined(CONFIG_PARAVIRT)
#error CONFIG_XEN defined!
#endif
@@ -110,7 +110,7 @@ build_cflags() {
fi
}

-CONFTEST_PREAMBLE="#include <linux/autoconf.h>
+CONFTEST_PREAMBLE="#include <generated/autoconf.h>
#if defined(CONFIG_XEN) && \
defined(CONFIG_XEN_INTERFACE_VERSION) && !defined(__XEN_INTERFACE_VERSION__)
#define __XEN_INTERFACE_VERSION__ CONFIG_XEN_INTERFACE_VERSION
@@ -1305,10 +1305,10 @@ case "$6" in
RET=1
FILE=""

- if [ -f $HEADERS/linux/utsrelease.h ]; then
- FILE="$HEADERS/linux/utsrelease.h"
- elif [ -f $OUTPUT/include/linux/utsrelease.h ]; then
- FILE="$OUTPUT/include/linux/utsrelease.h"
+ if [ -f $HEADERS/generated/utsrelease.h ]; then
+ FILE="$HEADERS/generated/utsrelease.h"
+ elif [ -f $OUTPUT/include/generated/utsrelease.h ]; then
+ FILE="$OUTPUT/include/generated/utsrelease.h"
elif [ -f $HEADERS/linux/version.h ]; then
FILE="$HEADERS/linux/version.h"
elif [ -f $OUTPUT/include/linux/version.h ]; then
@@ -1365,7 +1365,7 @@ case "$6" in
#
RET=1
VERBOSE=$7
- FILE="linux/autoconf.h"
+ FILE="generated/autoconf.h"

if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then
#
@@ -1419,7 +1419,7 @@ case "$6" in
#
RET=1
VERBOSE=$7
- FILE="linux/autoconf.h"
+ FILE="generated/autoconf.h"

if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then
#
diff -Nurp ./usr/src/nv/nvacpi.c ./usr/src/nv/nvacpi.c
--- ./usr/src/nv/nvacpi.c 2009-12-19 13:43:56.000000000 +1100
+++ ./usr/src/nv/nvacpi.c 2010-01-25 13:39:10.000000000 +1100
@@ -48,6 +48,10 @@ static const struct acpi_device_id nv_vi
};
#endif

+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33)
+#define acpi_walk_namespace(a,b,c,d,e,f) acpi_walk_namespace(a,b,c,d,e,f,NULL)
+#endif
+
static struct acpi_driver *nv_acpi_driver;
static acpi_handle nvif_handle = NULL;
static acpi_handle dsm_handle = NULL;
This last part looked familiar:
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33)
+#define acpi_walk_namespace(a,b,c,d,e,f) acpi_walk_namespace(a,b,c,d,e,f,NULL)
+#endif

so I applied it to the equivalent file in the 260.19.06 driver but alas it still failed to build with the same error message.
ckolivas is offline   Reply With Quote