Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 447566 | Differences between
and this patch

Collapse All | Expand All

(-)file_not_specified_in_diff (-10 / +32 lines)
Line  Link Here
0
-- usr/src/nv/conftest.sh
0
++ usr/src/nv/conftest.sh
Lines 127-132 Link Here
127
        if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
127
        if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
128
            MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default"
128
            MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default"
129
            MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default"
129
            MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default"
130
            MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/arch/x86/include/uapi"
130
        fi
131
        fi
131
        if [ "$XEN_PRESENT" != "0" ]; then
132
        if [ "$XEN_PRESENT" != "0" ]; then
132
            MACH_CFLAGS="-I$HEADERS/asm-$ARCH/mach-xen $MACH_CFLAGS"
133
            MACH_CFLAGS="-I$HEADERS/asm-$ARCH/mach-xen $MACH_CFLAGS"
Lines 136-151 Link Here
136
        if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
137
        if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
137
            MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default"
138
            MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default"
138
            MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default"
139
            MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default"
140
            MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/arch/x86/include/uapi"
139
        fi
141
        fi
140
        if [ "$XEN_PRESENT" != "0" ]; then
142
        if [ "$XEN_PRESENT" != "0" ]; then
141
            MACH_CFLAGS="-I$HEADERS/asm/mach-xen $MACH_CFLAGS"
143
            MACH_CFLAGS="-I$HEADERS/asm/mach-xen $MACH_CFLAGS"
142
        fi
144
        fi
143
    fi
145
    fi
144
146
145
    CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
147
    CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS $AUTOCONF_CFLAGS"
148
    CFLAGS="$CFLAGS -I$HEADERS -I$HEADERS/uapi"
146
149
147
    if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
150
    if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
148
        CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$OUTPUT/arch/x86/include/generated"
151
        CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include"
152
        CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include/uapi"
153
        CFLAGS="$CFLAGS -I$OUTPUT/arch/x86/include/generated"
154
        CFLAGS="$CFLAGS -I$OUTPUT/arch/x86/include/generated/uapi"
155
        CFLAGS="$CFLAGS -I$OUTPUT/include/generated"
156
        CFLAGS="$CFLAGS -I$OUTPUT/include/generated/uapi"
149
    fi
157
    fi
150
    if [ -n "$BUILD_PARAMS" ]; then
158
    if [ -n "$BUILD_PARAMS" ]; then
151
        CFLAGS="$CFLAGS -D$BUILD_PARAMS"
159
        CFLAGS="$CFLAGS -D$BUILD_PARAMS"
Lines 936-943 Link Here
936
            # Determine if the acpi_walk_namespace() function is present
943
            # Determine if the acpi_walk_namespace() function is present
937
            # and how many arguments it takes.
944
            # and how many arguments it takes.
938
            #
945
            #
946
            for linux_or_acpi in linux acpi; do
947
939
            echo "$CONFTEST_PREAMBLE
948
            echo "$CONFTEST_PREAMBLE
940
            #include <acpi/acpi.h>
949
            #include <${linux_or_acpi}/acpi.h>
941
            void conftest_acpi_walk_namespace(void) {
950
            void conftest_acpi_walk_namespace(void) {
942
                acpi_walk_namespace();
951
                acpi_walk_namespace();
943
            }" > conftest$$.c
952
            }" > conftest$$.c
Lines 952-958 Link Here
952
            fi
961
            fi
953
962
954
            echo "$CONFTEST_PREAMBLE
963
            echo "$CONFTEST_PREAMBLE
955
            #include <acpi/acpi.h>
964
            #include <${linux_or_acpi}/acpi.h>
956
            void conftest_acpi_walk_namespace(void) {
965
            void conftest_acpi_walk_namespace(void) {
957
                acpi_walk_namespace(0, NULL, 0, NULL, NULL, NULL, NULL);
966
                acpi_walk_namespace(0, NULL, 0, NULL, NULL, NULL, NULL);
958
            }" > conftest$$.c
967
            }" > conftest$$.c
Lines 968-974 Link Here
968
            fi
977
            fi
969
978
970
            echo "$CONFTEST_PREAMBLE
979
            echo "$CONFTEST_PREAMBLE
971
            #include <acpi/acpi.h>
980
            #include <${linux_or_acpi}/acpi.h>
972
            void conftest_acpi_walk_namespace(void) {
981
            void conftest_acpi_walk_namespace(void) {
973
                acpi_walk_namespace(0, NULL, 0, NULL, NULL, NULL);
982
                acpi_walk_namespace(0, NULL, 0, NULL, NULL, NULL);
974
            }" > conftest$$.c
983
            }" > conftest$$.c
Lines 981-989 Link Here
981
                echo "#define NV_ACPI_WALK_NAMESPACE_PRESENT" >> conftest.h
990
                echo "#define NV_ACPI_WALK_NAMESPACE_PRESENT" >> conftest.h
982
                echo "#define NV_ACPI_WALK_NAMESPACE_ARGUMENT_COUNT 6 " >> conftest.h
991
                echo "#define NV_ACPI_WALK_NAMESPACE_ARGUMENT_COUNT 6 " >> conftest.h
983
                return
992
                return
984
            else
985
                echo "#error acpi_walk_namespace() conftest failed!" >> conftest.h
986
            fi
993
            fi
994
            done
995
                echo "#error acpi_walk_namespace() conftest failed!" >> conftest.h
987
        ;;
996
        ;;
988
997
989
        acpi_os_wait_events_complete)
998
        acpi_os_wait_events_complete)
Lines 1453-1459 Link Here
1453
        FILE="linux/version.h"
1462
        FILE="linux/version.h"
1454
        SELECTED_MAKEFILE=""
1463
        SELECTED_MAKEFILE=""
1455
1464
1456
        if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then
1465
        if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE -o -f $OUTPUT/include/generated/uapi/$FILE ]; then
1457
            #
1466
            #
1458
            # We are either looking at a configured kernel source
1467
            # We are either looking at a configured kernel source
1459
            # tree or at headers shipped for a specific kernel.
1468
            # tree or at headers shipped for a specific kernel.
1460
-- usr/src/nv/nv-linux.h
1469
++ usr/src/nv/nv-linux.h
Lines 64-69 Link Here
64
#include <linux/module.h>
64
#include <linux/module.h>
65
#include <linux/kmod.h>
65
#include <linux/kmod.h>
66
66
67
#include <linux/mm.h>
68
69
#if !defined(VM_RESERVED)
70
#define VM_RESERVED    0x00000000
71
#endif
72
#if !defined(VM_DONTEXPAND)
73
#define VM_DONTEXPAND  0x00000000
74
#endif
75
#if !defined(VM_DONTDUMP)
76
#define VM_DONTDUMP    0x00000000
77
#endif
78
67
#include <linux/init.h>             /* module_init, module_exit         */
79
#include <linux/init.h>             /* module_init, module_exit         */
68
#include <linux/types.h>            /* pic_t, size_t, __u32, etc        */
80
#include <linux/types.h>            /* pic_t, size_t, __u32, etc        */
69
#include <linux/errno.h>            /* error codes                      */
81
#include <linux/errno.h>            /* error codes                      */

Return to bug 447566