Package: nvidia-kernel-source
Version: 1.0.7167-1
Severity: normal
Tags: patch
Hello,
First, I would like to congratulate you for having provided a package
for nvidia driver 7167 so quickly (I take it from incoming).
It compiles properly on kernel 2.6.11, but it fails with -mm* patches tree.
I tried with 2.6.11-mm2, and I succeeded in compiling it by using the
second patch you can find in this page :
http://www.nvnews.net/vbulletin/showthread.php?t=47405
I leave severity of this bug as "normal" only since this kernel tree is
experimental, but I think it should be applied.
Regards.
-- System Information:
Debian Release: 3.1
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)
Kernel: Linux 2.6.11-mm2-jedi1
Locale: LANG=POSIX, LC_CTYPE=POSIX (charmap=ANSI_X3.4-1968) (ignored: LC_ALL
set to POSIX)
Versions of packages nvidia-kernel-source depends on:
ii debhelper 4.2.31 helper programs for debian/rules
ii dpatch 2.0.10 patch maintenance system for Debia
ii make 3.80-9 The GNU version of the "make" util
ii sed 4.1.4-2 The GNU sed stream editor
-- no debconf information
diff -ru usr/src/nv/nv.c usr/src/nv.1237815/nv.c
--- nv/nv.c 2005-02-25 18:37:02.000000000 +0100
+++ nv.1237815/nv.c 2005-03-11 17:29:49.034335416 +0100
@@ -3071,14 +3071,15 @@
nv_printf(NV_DBG_WARNINGS, "NVRM: not using NVAGP, AGPGART is loaded!\n");
return status;
}
-#elif defined(NV_MULTIPLE_BRIDGE_AGPGART_PRESENT)
+#elif defined(AGPGART)
+#if defined(NV_MULTIPLE_BRIDGE_AGPGART_PRESENT)
if (!list_empty(&agp_bridges))
{
nv_printf(NV_DBG_WARNINGS,
"NVRM: not using NVAGP, an AGPGART backend is loaded!\n");
return status;
}
-#elif defined(AGPGART)
+#else /* NV_MULTIPLE_BRIDGE_AGPGART_PRESENT */
int error;
/*
* We can only safely use NvAGP when no backend has been
@@ -3096,6 +3097,7 @@
return status;
}
#endif
+#endif /* AGPGART */
#if defined(CONFIG_X86_64) && defined(CONFIG_GART_IOMMU)
nv_printf(NV_DBG_WARNINGS,
"NVRM: not using NVAGP, kernel was compiled with GART_IOMMU support!!\n");
