mirror of
https://gitdl.cn/https://github.com/chakralinux/core.git
synced 2025-02-05 04:57:14 +08:00
43 lines
1.5 KiB
Diff
43 lines
1.5 KiB
Diff
--- conftest.sh.dist 2012-10-11 19:18:22.704848496 -0400
|
|
+++ conftest.sh 2012-10-12 20:35:55.707213868 -0400
|
|
@@ -20,6 +20,7 @@
|
|
ISYSTEM=`$CC -print-file-name=include 2> /dev/null`
|
|
SOURCES=$4
|
|
HEADERS=$SOURCES/include
|
|
+HEADERSA=$SOURCES/include/uapi
|
|
OUTPUT=$5
|
|
XEN_PRESENT=1
|
|
|
|
@@ -118,7 +119,7 @@
|
|
fi
|
|
fi
|
|
|
|
- CFLAGS="$CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
|
|
+ CFLAGS="$CFLAGS $OUTPUT_CFLAGS -I$HEADERS -I$HEADERSA $AUTOCONF_CFLAGS"
|
|
|
|
test_xen
|
|
|
|
@@ -146,10 +147,10 @@
|
|
fi
|
|
fi
|
|
|
|
- CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
|
|
+ CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS -I$HEADERSA $AUTOCONF_CFLAGS"
|
|
|
|
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 -I$SOURCES/arch/x86/include/uapi -I$OUTPUT/arch/x86/include/generated -I$OUTPUT/arch/x86/include/generated/uapi"
|
|
elif [ "$ARCH" = "arm" ]; then
|
|
CFLAGS="$CFLAGS -I$SOURCES/arch/arm/include -I$OUTPUT/arch/arm/include/generated"
|
|
fi
|
|
--- nv-mmap.c.dist 2012-08-08 22:52:53.000000000 -0400
|
|
+++ nv-mmap.c 2012-08-14 23:52:41.257235863 -0400
|
|
@@ -450,7 +450,7 @@
|
|
NV_PRINT_AT(NV_DBG_MEMINFO, at);
|
|
nv_vm_list_page_count(&at->page_table[i], pages);
|
|
|
|
- vma->vm_flags |= (VM_IO | VM_LOCKED | VM_RESERVED);
|
|
+ vma->vm_flags |= (VM_IO | VM_LOCKED | (VM_DONTEXPAND | VM_DONTDUMP));
|
|
|
|
#if defined(VM_DRIVER_PAGES)
|