Commit a06f9e52 authored by popcornmix's avatar popcornmix
Browse files

Merge remote-tracking branch 'stable/linux-4.14.y' into rpi-4.14.y

parents e0d2b2b6 f952480a

Documentation/admin-guide/kernel-parameters.txt

+17 −0
Original line number Diff line number Diff line
@@ -3997,6 +3997,23 @@ 
			expediting.  Set to zero to disable automatic

			expediting.



	ssbd=		[ARM64,HW]

			Speculative Store Bypass Disable control



			On CPUs that are vulnerable to the Speculative

			Store Bypass vulnerability and offer a

			firmware based mitigation, this parameter

			indicates how the mitigation should be used:



			force-on:  Unconditionally enable mitigation for

				   for both kernel and userspace

			force-off: Unconditionally disable mitigation for

				   for both kernel and userspace

			kernel:    Always enable mitigation in the

				   kernel, and offer a prctl interface

				   to allow userspace to register its

				   interest in being mitigated too.



	stack_guard_gap=	[MM]

			override the default stack gap protection. The value

			is in page units and it defines how many pages prior

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 56

SUBLEVEL = 58

EXTRAVERSION =

NAME = Petit Gorille

arch/alpha/kernel/osf_sys.c

+1 −4
Original line number Diff line number Diff line
@@ -1183,13 +1183,10 @@ SYSCALL_DEFINE2(osf_getrusage, int, who, struct rusage32 __user *, ru) 
SYSCALL_DEFINE4(osf_wait4, pid_t, pid, int __user *, ustatus, int, options,

		struct rusage32 __user *, ur)

{

	unsigned int status = 0;

	struct rusage r;

	long err = kernel_wait4(pid, &status, options, &r);

	long err = kernel_wait4(pid, ustatus, options, &r);

	if (err <= 0)

		return err;

	if (put_user(status, ustatus))

		return -EFAULT;

	if (!ur)

		return err;

	if (put_tv32(&ur->ru_utime, &r.ru_utime))

arch/arc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -408,7 +408,7 @@ config ARC_HAS_DIV_REM 


config ARC_HAS_ACCL_REGS

	bool "Reg Pair ACCL:ACCH (FPU and/or MPY > 6)"

	default n

	default y

	help

	  Depending on the configuration, CPU can contain accumulator reg-pair

	  (also referred to as r58:r59). These can also be used by gcc as GPR so

arch/arc/configs/axs101_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ CONFIG_NAMESPACES=y 
# CONFIG_UTS_NS is not set

# CONFIG_PID_NS is not set

CONFIG_BLK_DEV_INITRD=y

CONFIG_INITRAMFS_SOURCE="../arc_initramfs/"

CONFIG_EMBEDDED=y

CONFIG_PERF_EVENTS=y

# CONFIG_VM_EVENT_COUNTERS is not set