| 1 |
lxnay 10/02/28 17:43:37 |
| 2 |
|
| 3 |
Added: nvidia-drivers-190.53-2.6.33.patch |
| 4 |
Log: |
| 5 |
add 2.6.33 kernel support to 190.53 |
| 6 |
(Portage version: 2.2_rc62/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 x11-drivers/nvidia-drivers/files/nvidia-drivers-190.53-2.6.33.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/nvidia-drivers/files/nvidia-drivers-190.53-2.6.33.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/nvidia-drivers/files/nvidia-drivers-190.53-2.6.33.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: nvidia-drivers-190.53-2.6.33.patch |
| 15 |
=================================================================== |
| 16 |
Index: usr/src/nv/conftest.sh |
| 17 |
=================================================================== |
| 18 |
--- usr/src/nv/conftest.sh |
| 19 |
+++ usr/src/nv/conftest.sh 2010-01-06 12:10:56.000000000 +0530 |
| 20 |
@@ -32,14 +32,14 @@ |
| 21 |
# CONFIG_XEN and CONFIG_PARAVIRT are present, text_xen() treats |
| 22 |
# the kernel as a stand-alone kernel. |
| 23 |
# |
| 24 |
- FILE="linux/autoconf.h" |
| 25 |
+ FILE="generated/autoconf.h" |
| 26 |
|
| 27 |
if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then |
| 28 |
# |
| 29 |
# We are looking at a configured source tree; verify |
| 30 |
# that it's not a Xen kernel. |
| 31 |
# |
| 32 |
- echo "#include <linux/autoconf.h> |
| 33 |
+ echo "#include <generated/autoconf.h> |
| 34 |
#if defined(CONFIG_XEN) && !defined(CONFIG_PARAVIRT) |
| 35 |
#error CONFIG_XEN defined! |
| 36 |
#endif |
| 37 |
@@ -111,7 +111,12 @@ |
| 38 |
fi |
| 39 |
} |
| 40 |
|
| 41 |
-CONFTEST_PREAMBLE="#include <linux/autoconf.h> |
| 42 |
+CONFTEST_PREAMBLE="#include <linux/version.h> |
| 43 |
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33) |
| 44 |
+ #include <generated/autoconf.h> |
| 45 |
+ #else |
| 46 |
+ #include <linux/autoconf.h> |
| 47 |
+ #endif |
| 48 |
#if defined(CONFIG_XEN) && \ |
| 49 |
defined(CONFIG_XEN_INTERFACE_VERSION) && !defined(__XEN_INTERFACE_VERSION__) |
| 50 |
#define __XEN_INTERFACE_VERSION__ CONFIG_XEN_INTERFACE_VERSION |
| 51 |
@@ -1294,7 +1299,7 @@ |
| 52 |
echo ""; |
| 53 |
fi |
| 54 |
fi |
| 55 |
- exit $RET |
| 56 |
+# exit $RET |
| 57 |
;; |
| 58 |
|
| 59 |
get_uname) |
| 60 |
@@ -1316,11 +1321,11 @@ |
| 61 |
# tree or at headers shipped for a specific kernel. |
| 62 |
# Determine the kernel version using a compile check. |
| 63 |
# |
| 64 |
- FILE="linux/utsrelease.h" |
| 65 |
+ FILE="generated/utsrelease.h" |
| 66 |
|
| 67 |
if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then |
| 68 |
echo "$CONFTEST_PREAMBLE |
| 69 |
- #include <linux/utsrelease.h> |
| 70 |
+ #include <generated/utsrelease.h> |
| 71 |
int main() { |
| 72 |
printf(\"%s\", UTS_RELEASE); |
| 73 |
return 0; |
| 74 |
@@ -1375,7 +1380,7 @@ |
| 75 |
# |
| 76 |
RET=1 |
| 77 |
VERBOSE=$6 |
| 78 |
- FILE="linux/autoconf.h" |
| 79 |
+ FILE="generated/autoconf.h" |
| 80 |
|
| 81 |
if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then |
| 82 |
# |
| 83 |
@@ -1429,7 +1434,7 @@ |
| 84 |
# |
| 85 |
RET=1 |
| 86 |
VERBOSE=$6 |
| 87 |
- FILE="linux/autoconf.h" |
| 88 |
+ FILE="generated/autoconf.h" |
| 89 |
|
| 90 |
if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then |
| 91 |
# |
| 92 |
Index: usr/src/nv/nvacpi.c |
| 93 |
=================================================================== |
| 94 |
--- usr/src/nv/nvacpi.c |
| 95 |
+++ usr/src/nv/nvacpi.c 2010-01-06 12:10:56.000000000 +0530 |
| 96 |
@@ -49,6 +49,10 @@ |
| 97 |
}; |
| 98 |
#endif |
| 99 |
|
| 100 |
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33) |
| 101 |
+#define acpi_walk_namespace(a,b,c,d,e,f) acpi_walk_namespace(a,b,c,d,e,f,NULL) |
| 102 |
+#endif |
| 103 |
+ |
| 104 |
static struct acpi_driver *nv_acpi_driver; |
| 105 |
static acpi_handle nvif_handle = NULL; |
| 106 |
static acpi_handle dsm_handle = NULL; |
Archives