Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 336106 Details for
Bug 447566
x11-drivers/nvidia-drivers-* fails to build/load/run with kernel-*
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Fix for x11-drivers/nvidia-drivers-173.14.36 and kernel-3.7
nvidia-drivers-173.14.36-kernel-3.7.patch (text/plain), 4.16 KB, created by
Martin Väth
on 2013-01-19 09:27:01 UTC
(
hide
)
Description:
Fix for x11-drivers/nvidia-drivers-173.14.36 and kernel-3.7
Filename:
MIME Type:
Creator:
Martin Väth
Created:
2013-01-19 09:27:01 UTC
Size:
4.16 KB
patch
obsolete
>--- usr/src/nv/conftest.sh >+++ usr/src/nv/conftest.sh >@@ -127,6 +127,7 @@ > if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then > MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default" > MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default" >+ MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/arch/x86/include/uapi" > fi > if [ "$XEN_PRESENT" != "0" ]; then > MACH_CFLAGS="-I$HEADERS/asm-$ARCH/mach-xen $MACH_CFLAGS" >@@ -136,16 +137,22 @@ > if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then > MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default" > MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default" >+ MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/arch/x86/include/uapi" > fi > if [ "$XEN_PRESENT" != "0" ]; then > MACH_CFLAGS="-I$HEADERS/asm/mach-xen $MACH_CFLAGS" > fi > fi > >- CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS" >+ CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS $AUTOCONF_CFLAGS" >+ CFLAGS="$CFLAGS -I$HEADERS -I$HEADERS/uapi" > > if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then >- CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$OUTPUT/arch/x86/include/generated" >+ CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include" >+ CFLAGS="$CFLAGS -I$OUTPUT/arch/x86/include/generated" >+ CFLAGS="$CFLAGS -I$OUTPUT/arch/x86/include/generated/uapi" >+ CFLAGS="$CFLAGS -I$OUTPUT/include/generated" >+ CFLAGS="$CFLAGS -I$OUTPUT/include/generated/uapi" > fi > if [ -n "$BUILD_PARAMS" ]; then > CFLAGS="$CFLAGS -D$BUILD_PARAMS" >@@ -936,8 +943,10 @@ > # Determine if the acpi_walk_namespace() function is present > # and how many arguments it takes. > # >+ for linux_or_acpi in linux acpi; do >+ > echo "$CONFTEST_PREAMBLE >- #include <acpi/acpi.h> >+ #include <${linux_or_acpi}/acpi.h> > void conftest_acpi_walk_namespace(void) { > acpi_walk_namespace(); > }" > conftest$$.c >@@ -952,7 +961,7 @@ > fi > > echo "$CONFTEST_PREAMBLE >- #include <acpi/acpi.h> >+ #include <${linux_or_acpi}/acpi.h> > void conftest_acpi_walk_namespace(void) { > acpi_walk_namespace(0, NULL, 0, NULL, NULL, NULL, NULL); > }" > conftest$$.c >@@ -968,7 +977,7 @@ > fi > > echo "$CONFTEST_PREAMBLE >- #include <acpi/acpi.h> >+ #include <${linux_or_acpi}/acpi.h> > void conftest_acpi_walk_namespace(void) { > acpi_walk_namespace(0, NULL, 0, NULL, NULL, NULL); > }" > conftest$$.c >@@ -981,9 +990,9 @@ > echo "#define NV_ACPI_WALK_NAMESPACE_PRESENT" >> conftest.h > echo "#define NV_ACPI_WALK_NAMESPACE_ARGUMENT_COUNT 6 " >> conftest.h > return >- else >- echo "#error acpi_walk_namespace() conftest failed!" >> conftest.h > fi >+ done >+ echo "#error acpi_walk_namespace() conftest failed!" >> conftest.h > ;; > > acpi_os_wait_events_complete) >@@ -1453,7 +1462,7 @@ > FILE="linux/version.h" > SELECTED_MAKEFILE="" > >- if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then >+ if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE -o -f $OUTPUT/include/generated/uapi/$FILE ]; then > # > # We are either looking at a configured kernel source > # tree or at headers shipped for a specific kernel. >--- usr/src/nv/nv-linux.h >+++ usr/src/nv/nv-linux.h >@@ -64,6 +64,18 @@ > #include <linux/module.h> > #include <linux/kmod.h> > >+#include <linux/mm.h> >+ >+#if !defined(VM_RESERVED) >+#define VM_RESERVED 0x00000000 >+#endif >+#if !defined(VM_DONTEXPAND) >+#define VM_DONTEXPAND 0x00000000 >+#endif >+#if !defined(VM_DONTDUMP) >+#define VM_DONTDUMP 0x00000000 >+#endif >+ > #include <linux/init.h> /* module_init, module_exit */ > #include <linux/types.h> /* pic_t, size_t, __u32, etc */ > #include <linux/errno.h> /* error codes */
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 447566
:
333002
|
336100
|
336106
|
338262
|
338290
|
339470
|
340010
|
340362
|
352578
|
352940
|
359992