Gentoo Attachment #174224 for bug #238969

View | Details | Raw Unified
Collapse All | Expand All

(-) usr/src/nv/Makefile.kbuild (-2 / +4 lines)

Lines 189-202	Link Here

	acquire_console_sem \

	acquire_console_sem \

	kmem_cache_create \

	kmem_cache_create \

	on_each_cpu \

	on_each_cpu \

	smp_call_function

	smp_call_function \

 	acpi_evaluate_integer

else

else

 COMPILE_TESTS = \

 COMPILE_TESTS = \

	remap_page_range \

	remap_page_range \

	vmap \

	vmap \

	change_page_attr \

	change_page_attr \

	i2c_adapter \

	i2c_adapter \

	smp_call_function

	smp_call_function \

 	acpi_evaluate_integer

endif

endif

(-) usr/src/nv/Makefile.nvidia (-1 / +2 lines)

Lines 63-69	Link Here

	vmap \

	vmap \

	change_page_attr \

	change_page_attr \

	i2c_adapter \

	i2c_adapter \

	smp_call_function

	smp_call_function \

	acpi_evaluate_integer

DEFINES+=$(EXTRA_DEFINES)

DEFINES+=$(EXTRA_DEFINES)

(-) usr/src/nv/conftest.sh (-2 / +62 lines)

Lines 67-72	Link Here

build_cflags() {

build_cflags() {

    ARCH=`uname -m | sed -e 's/i.86/i386/'`

    BASE_CFLAGS="-D__KERNEL__ \

    BASE_CFLAGS="-D__KERNEL__ \

-DKBUILD_BASENAME=\"#conftest$$\" -DKBUILD_MODNAME=\"#conftest$$\" \

-DKBUILD_BASENAME=\"#conftest$$\" -DKBUILD_MODNAME=\"#conftest$$\" \

-nostdinc -isystem $ISYSTEM"

-nostdinc -isystem $ISYSTEM"

Lines 80-95	Link Here

    test_xen

    test_xen

    if [ "$OUTPUT" != "$SOURCES" ]; then

    if [ "$OUTPUT" != "$SOURCES" ]; then

        ARCH=`uname -m | sed -e 's/i.86/i386/'`

        MACH_CFLAGS="-I$HEADERS/asm-$ARCH/mach-default"

        MACH_CFLAGS="-I$HEADERS/asm-$ARCH/mach-default"

        if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then

        if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then

            MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default"

            MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default"

            MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default"

fi

fi

        if [ "$XEN_PRESENT" != "0" ]; then

        if [ "$XEN_PRESENT" != "0" ]; then

            MACH_CFLAGS="-I$HEADERS/asm-$ARCH/mach-xen $MACH_CFLAGS"

            MACH_CFLAGS="-I$HEADERS/asm-$ARCH/mach-xen $MACH_CFLAGS"

fi

fi

    else

    else

        MACH_CFLAGS="-I$HEADERS/asm/mach-default"

        MACH_CFLAGS="-I$HEADERS/asm/mach-default"

        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"

fi

        if [ "$XEN_PRESENT" != "0" ]; then

        if [ "$XEN_PRESENT" != "0" ]; then

            MACH_CFLAGS="-I$HEADERS/asm/mach-xen $MACH_CFLAGS"

            MACH_CFLAGS="-I$HEADERS/asm/mach-xen $MACH_CFLAGS"

fi

fi

Lines 97-102	Link Here

    CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS"

    CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS"

    if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then

        CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include"

fi

    if [ -n "$BUILD_PARAMS" ]; then

    if [ -n "$BUILD_PARAMS" ]; then

        CFLAGS="$CFLAGS -D$BUILD_PARAMS"

        CFLAGS="$CFLAGS -D$BUILD_PARAMS"

fi

fi

Lines 858-864	Link Here

            if [ -f conftest$$.o ]; then

            if [ -f conftest$$.o ]; then

                rm -f conftest$$.o

                rm -f conftest$$.o

                echo "#undef NV_ON_EACH_CPU" >> conftest.h

                echo "#undef NV_ON_EACH_CPU_PRESENT" >> conftest.h

                return

                return

fi

fi

Lines 897-902	Link Here

fi

fi

;;

;;

        acpi_evaluate_integer)

            # Determine if the acpi_evaluate_integer() function is

            # present and the type of its 'data' argument.

            echo "$CONFTEST_PREAMBLE

            #include <acpi/acpi_bus.h>

            acpi_status acpi_evaluate_integer(acpi_handle h, acpi_string s,

                struct acpi_object_list *l, unsigned long long *d) {

                return AE_OK;

            }" > conftest$$.c

            $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1

            rm -f conftest$$.c

            if [ -f conftest$$.o ]; then

                rm -f conftest$$.o

                echo "#define NV_ACPI_EVALUATE_INTEGER_PRESENT" >> conftest.h

                echo "typedef unsigned long long nv_acpi_integer_t;" >> conftest.h

                return

fi

            echo "$CONFTEST_PREAMBLE

            #include <acpi/acpi_bus.h>

            acpi_status acpi_evaluate_integer(acpi_handle h, acpi_string s,

                struct acpi_object_list *l, unsigned long *d) {

                return AE_OK;

            }" > conftest$$.c

            $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1

            rm -f conftest$$.c

            if [ -f conftest$$.o ]; then

                rm -f conftest$$.o

                echo "#define NV_ACPI_EVALUATE_INTEGER_PRESENT" >> conftest.h

                echo "typedef unsigned long nv_acpi_integer_t;" >> conftest.h

                return

            else

                # We can't report a compile test failure here because

                # this is a catch-all for both kernels that don't

                # have acpi_evaluate_integer() and kernels that have

                # broken header files that make it impossible to

                # tell if the function is present.

                echo "#undef NV_ACPI_EVALUATE_INTEGER_PRESENT" >> conftest.h

                echo "typedef unsigned long nv_acpi_integer_t;" >> conftest.h

fi

;;

    esac

    esac

(-) usr/src/nv/nvacpi.c (-6 / +4 lines)

Lines 136-142	Link Here

    struct acpi_object_list control_argument_list = { 0, NULL };

    struct acpi_object_list control_argument_list = { 0, NULL };

    nv_stack_t *sp = NULL;

    nv_stack_t *sp = NULL;

    struct list_head *node, *next;

    struct list_head *node, *next;

    unsigned long device_id = 0;

    nv_acpi_integer_t device_id = 0;

    NV_KMEM_CACHE_ALLOC_STACK(sp);

    NV_KMEM_CACHE_ALLOC_STACK(sp);

    if (sp == NULL)

    if (sp == NULL)

Lines 157-167	Link Here

    os_mem_set((void *)pNvAcpiObject, 0, sizeof(nv_acpi_t));

    os_mem_set((void *)pNvAcpiObject, 0, sizeof(nv_acpi_t));

    // assign driver data structure ptr to this device

    device->driver_data = pNvAcpiObject;

    acpi_driver_data(device) = pNvAcpiObject;

    // store a device reference in our object

    pNvAcpiObject->device = device;

    pNvAcpiObject->device = device;

    pNvAcpiObject->sp = sp;

    pNvAcpiObject->sp = sp;

    // grab handles to all the important nodes representing devices

    // grab handles to all the important nodes representing devices

Lines 305-311	Link Here

*/

*/

    nv_acpi_t *pNvAcpiObject = data;

    nv_acpi_t *pNvAcpiObject = data;

    u32 event_val = 0;

    u32 event_val = 0;

    unsigned long state;

    nv_acpi_integer_t state;

    int status = 0;

    int status = 0;

Attachment #174224: nvidia-drivers-177.80 for about linux kernel 2.6.27.x or above issue patch for bug #238969