Forum | Documentation | Website | Blog

Skip to content
Snippets Groups Projects
Commit 8d6ece90 authored by Robert Nelson's avatar Robert Nelson
Browse files

4.9-rc4-bone2 release


Signed-off-by: default avatarRobert Nelson <robertcnelson@gmail.com>
parent 710d98a0
No related merge requests found
......@@ -286,7 +286,7 @@ reverts () {
${git} "${DIR}/patches/reverts/0001-Revert-eeprom-at24-check-if-the-chip-is-functional-i.patch"
#https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/log/drivers/net/wireless/ti
# ${git} "${DIR}/patches/reverts/0002-Revert-wlcore-sdio-drop-kfree-for-memory-allocated-w.patch"
${git} "${DIR}/patches/reverts/0002-Revert-wlcore-sdio-drop-kfree-for-memory-allocated-w.patch"
${git} "${DIR}/patches/reverts/0003-Revert-wlcore-wl18xx-Use-chip-specific-configuration.patch"
${git} "${DIR}/patches/reverts/0004-Revert-wlcore-Fix-config-firmware-loading-issues.patch"
${git} "${DIR}/patches/reverts/0005-Revert-wlcore-spi-Populate-config-firmware-data.patch"
......@@ -300,22 +300,6 @@ reverts () {
fi
}
fixes () {
echo "dir: fixes"
#regenerate="enable"
if [ "x${regenerate}" = "xenable" ] ; then
start_cleanup
fi
${git} "${DIR}/patches/fixes/0004-ARM-wire-up-new-pkey-syscalls.patch"
if [ "x${regenerate}" = "xenable" ] ; then
wdir="fixes"
number=1
cleanup
fi
}
build () {
dir 'build/kbuild'
}
......@@ -622,7 +606,6 @@ beaglebone () {
###
#backports
reverts
fixes
build
drivers
soc
......
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm 4.9.0-rc3 Kernel Configuration
# Linux/arm 4.9.0-rc4 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
......
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm 4.9.0-rc3 Kernel Configuration
# Linux/arm 4.9.0-rc4 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
......
From 37948e866fcbeec8b922f326126ee2d49955f410 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@armlinux.org.uk>
Date: Tue, 18 Oct 2016 21:46:18 +0100
Subject: [PATCH 4/4] ARM: wire up new pkey syscalls
Wire up the new pkey syscalls for ARM.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
---
arch/arm/include/asm/unistd.h | 2 +-
arch/arm/include/uapi/asm/unistd.h | 3 +++
arch/arm/kernel/calls.S | 3 +++
3 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/arch/arm/include/asm/unistd.h b/arch/arm/include/asm/unistd.h
index 194b699..ada0d29 100644
--- a/arch/arm/include/asm/unistd.h
+++ b/arch/arm/include/asm/unistd.h
@@ -19,7 +19,7 @@
* This may need to be greater than __NR_last_syscall+1 in order to
* account for the padding in the syscall table
*/
-#define __NR_syscalls (396)
+#define __NR_syscalls (400)
#define __ARCH_WANT_STAT64
#define __ARCH_WANT_SYS_GETHOSTNAME
diff --git a/arch/arm/include/uapi/asm/unistd.h b/arch/arm/include/uapi/asm/unistd.h
index 2cb9dc7..314100a 100644
--- a/arch/arm/include/uapi/asm/unistd.h
+++ b/arch/arm/include/uapi/asm/unistd.h
@@ -420,6 +420,9 @@
#define __NR_copy_file_range (__NR_SYSCALL_BASE+391)
#define __NR_preadv2 (__NR_SYSCALL_BASE+392)
#define __NR_pwritev2 (__NR_SYSCALL_BASE+393)
+#define __NR_pkey_mprotect (__NR_SYSCALL_BASE+394)
+#define __NR_pkey_alloc (__NR_SYSCALL_BASE+395)
+#define __NR_pkey_free (__NR_SYSCALL_BASE+396)
/*
* The following SWIs are ARM private.
diff --git a/arch/arm/kernel/calls.S b/arch/arm/kernel/calls.S
index 703fa0f..08030b1 100644
--- a/arch/arm/kernel/calls.S
+++ b/arch/arm/kernel/calls.S
@@ -403,6 +403,9 @@
CALL(sys_copy_file_range)
CALL(sys_preadv2)
CALL(sys_pwritev2)
+ CALL(sys_pkey_mprotect)
+/* 395 */ CALL(sys_pkey_alloc)
+ CALL(sys_pkey_free)
#ifndef syscalls_counted
.equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls
#define syscalls_counted
--
2.10.1
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm 4.9.0-rc3 Kernel Configuration
# Linux/arm 4.9.0-rc4 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
......
......@@ -27,8 +27,8 @@ toolchain="gcc_linaro_gnueabihf_6"
#Kernel/Build
KERNEL_REL=4.9
KERNEL_TAG=${KERNEL_REL}-rc3
BUILD=${build_prefix}1.2
KERNEL_TAG=${KERNEL_REL}-rc4
BUILD=${build_prefix}2
kernel_rt=".X-rtY"
#v4.X-rcX + upto SHA
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment