|
Line
Link Here
|
| 0 |
-- a/kernel/conftest.sh |
0 |
++ b/kernel/conftest.sh |
|
Lines 127-132
build_cflags() {
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 |
elif [ "$ARCH" = "arm" ]; then |
131 |
elif [ "$ARCH" = "arm" ]; then |
| 131 |
MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/arm/mach-tegra/include -D__LINUX_ARM_ARCH__=7" |
132 |
MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/arm/mach-tegra/include -D__LINUX_ARM_ARCH__=7" |
| 132 |
fi |
133 |
fi |
|
Lines 138-143
build_cflags() {
Link Here
|
| 138 |
if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then |
139 |
if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then |
| 139 |
MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default" |
140 |
MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default" |
| 140 |
MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default" |
141 |
MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default" |
|
|
142 |
MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/arch/x86/include/uapi" |
| 141 |
elif [ "$ARCH" = "arm" ]; then |
143 |
elif [ "$ARCH" = "arm" ]; then |
| 142 |
MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/arm/mach-tegra/include -D__LINUX_ARM_ARCH__=7" |
144 |
MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/arm/mach-tegra/include -D__LINUX_ARM_ARCH__=7" |
| 143 |
fi |
145 |
fi |
|
Lines 147-155
build_cflags() {
Link Here
|
| 147 |
fi |
149 |
fi |
| 148 |
|
150 |
|
| 149 |
CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS" |
151 |
CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS" |
|
|
152 |
CFLAGS="$CFLAGS -I$HEADERS -I$HEADERS/uapi" |
| 150 |
|
153 |
|
| 151 |
if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then |
154 |
if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then |
| 152 |
CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$OUTPUT/arch/x86/include/generated" |
155 |
CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include" |
|
|
156 |
CFLAGS="$CFLAGS -I$OUTPUT/arch/x86/include/generated" |
| 157 |
CFLAGS="$CFLAGS -I$OUTPUT/arch/x86/include/generated/uapi" |
| 153 |
elif [ "$ARCH" = "arm" ]; then |
158 |
elif [ "$ARCH" = "arm" ]; then |
| 154 |
CFLAGS="$CFLAGS -I$SOURCES/arch/arm/include -I$OUTPUT/arch/arm/include/generated" |
159 |
CFLAGS="$CFLAGS -I$SOURCES/arch/arm/include -I$OUTPUT/arch/arm/include/generated" |
| 155 |
fi |
160 |
fi |
| 156 |
-- a/kernel/nv-mmap.c |
161 |
++ b/kernel/nv-mmap.c |
|
Lines 463-469
int nv_kern_mmap(
Link Here
|
| 463 |
NV_PRINT_AT(NV_DBG_MEMINFO, at); |
463 |
NV_PRINT_AT(NV_DBG_MEMINFO, at); |
| 464 |
nv_vm_list_page_count(&at->page_table[i], pages); |
464 |
nv_vm_list_page_count(&at->page_table[i], pages); |
| 465 |
|
465 |
|
|
|
466 |
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0) |
| 467 |
vma->vm_flags |= (VM_IO | VM_LOCKED | (VM_DONTEXPAND | VM_DONTDUMP)); |
| 468 |
#else |
| 466 |
vma->vm_flags |= (VM_IO | VM_LOCKED | VM_RESERVED); |
469 |
vma->vm_flags |= (VM_IO | VM_LOCKED | VM_RESERVED); |
|
|
470 |
#endif |
| 467 |
|
471 |
|
| 468 |
#if defined(VM_DRIVER_PAGES) |
472 |
#if defined(VM_DRIVER_PAGES) |
| 469 |
vma->vm_flags |= VM_DRIVER_PAGES; |
473 |
vma->vm_flags |= VM_DRIVER_PAGES; |
