mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
Merge remote-tracking branch 'upstream/master' into openelec-settings
This commit is contained in:
Stefan Saraev
commit
3465d6c49e
@ -24,5 +24,6 @@
|
||||
TTY="3"
|
||||
|
||||
if [ "$DEBUG" = "yes" ]; then
|
||||
PS1="\007\]\[\e[1;32m\]\h\[\e[1;32m\]:\[\e[1;34m\]\w \[\e[0m\]\\$ "
|
||||
openvt -w -c $TTY /bin/sh &
|
||||
fi
|
||||
|
||||
@ -24,5 +24,6 @@
|
||||
TTY="1"
|
||||
|
||||
while true; do
|
||||
PS1="\007\]\[\e[1;32m\]\h\[\e[1;32m\]:\[\e[1;34m\]\w \[\e[0m\]\\$ "
|
||||
openvt -w -c $TTY /bin/sh
|
||||
done
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="xf86-video-nvidia-legacy"
|
||||
PKG_VERSION="304.84"
|
||||
PKG_VERSION="304.64"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="i386 x86_64"
|
||||
PKG_LICENSE="nonfree"
|
||||
|
||||
@ -0,0 +1,46 @@
|
||||
From 1e3d34ce7d8c4912c08386589843fcc4ba4d38bf Mon Sep 17 00:00:00 2001
|
||||
From: Alberto Milone <alberto.milone@canonical.com>
|
||||
Date: Wed, 7 Nov 2012 12:03:46 +0100
|
||||
Subject: [PATCH 1/2] Make use of the new uapi framework
|
||||
|
||||
---
|
||||
conftest.sh | 7 ++++---
|
||||
1 file changed, 4 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/kernel/conftest.sh b/kernel/conftest.sh
|
||||
index 388e268..8eff4d7 100755
|
||||
--- a/kernel/conftest.sh
|
||||
+++ b/kernel/conftest.sh
|
||||
@@ -20,6 +20,7 @@ ARCH=$3
|
||||
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 @@ build_cflags() {
|
||||
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 @@ build_cflags() {
|
||||
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
|
||||
--
|
||||
1.7.9.5
|
||||
|
||||
@ -0,0 +1,28 @@
|
||||
From fed1fa17202cf13bf80bbbad3bf0ffdfd192df42 Mon Sep 17 00:00:00 2001
|
||||
From: Alberto Milone <alberto.milone@canonical.com>
|
||||
Date: Wed, 7 Nov 2012 12:11:02 +0100
|
||||
Subject: [PATCH 1/1] Replace VM_RESERVED with VM_DONTEXPAND and VM_DONTDUMP
|
||||
|
||||
---
|
||||
nv-mmap.c | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/kernel/nv-mmap.c b/kernel/nv-mmap.c
|
||||
index acc02ec..b2d5cdb 100644
|
||||
--- a/kernel/nv-mmap.c
|
||||
+++ b/kernel/nv-mmap.c
|
||||
@@ -463,7 +463,11 @@ int nv_kern_mmap(
|
||||
NV_PRINT_AT(NV_DBG_MEMINFO, at);
|
||||
nv_vm_list_page_count(&at->page_table[i], pages);
|
||||
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
|
||||
+ vma->vm_flags |= (VM_IO | VM_LOCKED | (VM_DONTEXPAND | VM_DONTDUMP));
|
||||
+#else
|
||||
vma->vm_flags |= (VM_IO | VM_LOCKED | VM_RESERVED);
|
||||
+#endif
|
||||
|
||||
#if defined(VM_DRIVER_PAGES)
|
||||
vma->vm_flags |= VM_DRIVER_PAGES;
|
||||
--
|
||||
1.7.9.5
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="xf86-video-nvidia"
|
||||
PKG_VERSION="304.84"
|
||||
PKG_VERSION="304.64"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="i386 x86_64"
|
||||
PKG_LICENSE="nonfree"
|
||||
|
||||
@ -0,0 +1,46 @@
|
||||
From 1e3d34ce7d8c4912c08386589843fcc4ba4d38bf Mon Sep 17 00:00:00 2001
|
||||
From: Alberto Milone <alberto.milone@canonical.com>
|
||||
Date: Wed, 7 Nov 2012 12:03:46 +0100
|
||||
Subject: [PATCH 1/2] Make use of the new uapi framework
|
||||
|
||||
---
|
||||
conftest.sh | 7 ++++---
|
||||
1 file changed, 4 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/kernel/conftest.sh b/kernel/conftest.sh
|
||||
index 388e268..8eff4d7 100755
|
||||
--- a/kernel/conftest.sh
|
||||
+++ b/kernel/conftest.sh
|
||||
@@ -20,6 +20,7 @@ ARCH=$3
|
||||
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 @@ build_cflags() {
|
||||
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 @@ build_cflags() {
|
||||
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
|
||||
--
|
||||
1.7.9.5
|
||||
|
||||
@ -0,0 +1,28 @@
|
||||
From fed1fa17202cf13bf80bbbad3bf0ffdfd192df42 Mon Sep 17 00:00:00 2001
|
||||
From: Alberto Milone <alberto.milone@canonical.com>
|
||||
Date: Wed, 7 Nov 2012 12:11:02 +0100
|
||||
Subject: [PATCH 1/1] Replace VM_RESERVED with VM_DONTEXPAND and VM_DONTDUMP
|
||||
|
||||
---
|
||||
nv-mmap.c | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/kernel/nv-mmap.c b/kernel/nv-mmap.c
|
||||
index acc02ec..b2d5cdb 100644
|
||||
--- a/kernel/nv-mmap.c
|
||||
+++ b/kernel/nv-mmap.c
|
||||
@@ -463,7 +463,11 @@ int nv_kern_mmap(
|
||||
NV_PRINT_AT(NV_DBG_MEMINFO, at);
|
||||
nv_vm_list_page_count(&at->page_table[i], pages);
|
||||
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
|
||||
+ vma->vm_flags |= (VM_IO | VM_LOCKED | (VM_DONTEXPAND | VM_DONTDUMP));
|
||||
+#else
|
||||
vma->vm_flags |= (VM_IO | VM_LOCKED | VM_RESERVED);
|
||||
+#endif
|
||||
|
||||
#if defined(VM_DRIVER_PAGES)
|
||||
vma->vm_flags |= VM_DRIVER_PAGES;
|
||||
--
|
||||
1.7.9.5
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user