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

Collapse All | Expand All

(-)usr/src/nv/conftest.sh (-8 / +13 lines)
Lines 32-45 Link Here
32
    # CONFIG_XEN and CONFIG_PARAVIRT are present, text_xen() treats
32
    # CONFIG_XEN and CONFIG_PARAVIRT are present, text_xen() treats
33
    # the kernel as a stand-alone kernel.
33
    # the kernel as a stand-alone kernel.
34
    #
34
    #
35
    FILE="linux/autoconf.h"
35
    FILE="generated/autoconf.h"
36
36
37
    if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then
37
    if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then
38
        #
38
        #
39
        # We are looking at a configured source tree; verify
39
        # We are looking at a configured source tree; verify
40
        # that it's not a Xen kernel.
40
        # that it's not a Xen kernel.
41
        #
41
        #
42
        echo "#include <linux/autoconf.h>
42
        echo "#include <generated/autoconf.h>
43
        #if defined(CONFIG_XEN) && !defined(CONFIG_PARAVIRT)
43
        #if defined(CONFIG_XEN) && !defined(CONFIG_PARAVIRT)
44
        #error CONFIG_XEN defined!
44
        #error CONFIG_XEN defined!
45
        #endif
45
        #endif
Lines 111-117 Link Here
111
    fi
111
    fi
112
}
112
}
113
113
114
CONFTEST_PREAMBLE="#include <linux/autoconf.h>
114
CONFTEST_PREAMBLE="#include <linux/version.h>
115
    #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
116
    #include <generated/autoconf.h>
117
    #else
118
    #include <linux/autoconf.h>
119
    #endif
115
    #if defined(CONFIG_XEN) && \
120
    #if defined(CONFIG_XEN) && \
116
        defined(CONFIG_XEN_INTERFACE_VERSION) &&  !defined(__XEN_INTERFACE_VERSION__)
121
        defined(CONFIG_XEN_INTERFACE_VERSION) &&  !defined(__XEN_INTERFACE_VERSION__)
117
    #define __XEN_INTERFACE_VERSION__ CONFIG_XEN_INTERFACE_VERSION
122
    #define __XEN_INTERFACE_VERSION__ CONFIG_XEN_INTERFACE_VERSION
Lines 1294-1300 Link Here
1294
                echo "";
1299
                echo "";
1295
            fi
1300
            fi
1296
        fi
1301
        fi
1297
        exit $RET
1302
#        exit $RET
1298
    ;;
1303
    ;;
1299
1304
1300
    get_uname)
1305
    get_uname)
Lines 1316-1326 Link Here
1316
            # tree or at headers shipped for a specific kernel.
1321
            # tree or at headers shipped for a specific kernel.
1317
            # Determine the kernel version using a compile check.
1322
            # Determine the kernel version using a compile check.
1318
            #
1323
            #
1319
            FILE="linux/utsrelease.h"
1324
            FILE="generated/utsrelease.h"
1320
1325
1321
            if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then
1326
            if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then
1322
                echo "$CONFTEST_PREAMBLE
1327
                echo "$CONFTEST_PREAMBLE
1323
                #include <linux/utsrelease.h>
1328
                #include <generated/utsrelease.h>
1324
                int main() {
1329
                int main() {
1325
                    printf(\"%s\", UTS_RELEASE);
1330
                    printf(\"%s\", UTS_RELEASE);
1326
                    return 0;
1331
                    return 0;
Lines 1375-1381 Link Here
1375
        #
1380
        #
1376
        RET=1
1381
        RET=1
1377
        VERBOSE=$6
1382
        VERBOSE=$6
1378
        FILE="linux/autoconf.h"
1383
        FILE="generated/autoconf.h"
1379
1384
1380
        if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then
1385
        if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then
1381
            #
1386
            #
Lines 1429-1435 Link Here
1429
        #
1434
        #
1430
        RET=1
1435
        RET=1
1431
        VERBOSE=$6
1436
        VERBOSE=$6
1432
        FILE="linux/autoconf.h"
1437
        FILE="generated/autoconf.h"
1433
1438
1434
        if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then
1439
        if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then
1435
            #
1440
            #
(-)usr/src/nv/nvacpi.c (+4 lines)
Lines 49-54 Link Here
49
};
49
};
50
#endif
50
#endif
51
51
52
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33)
53
#define acpi_walk_namespace(a,b,c,d,e,f) acpi_walk_namespace(a,b,c,d,e,f,NULL)
54
#endif
55
52
static struct acpi_driver *nv_acpi_driver;
56
static struct acpi_driver *nv_acpi_driver;
53
static acpi_handle nvif_handle = NULL;
57
static acpi_handle nvif_handle = NULL;
54
static acpi_handle dsm_handle  = NULL;
58
static acpi_handle dsm_handle  = NULL;

Return to bug 301318