Commit 27e84c62 authored by popcornmix's avatar popcornmix
Browse files

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

parents 8c8666ff 7fe7a0f4

Makefile

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

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 68

SUBLEVEL = 69

EXTRAVERSION =

NAME = Petit Gorille

arch/alpha/kernel/osf_sys.c

+24 −27
Original line number Diff line number Diff line
@@ -530,24 +530,19 @@ SYSCALL_DEFINE4(osf_mount, unsigned long, typenr, const char __user *, path, 
SYSCALL_DEFINE1(osf_utsname, char __user *, name)

{

	int error;

	char tmp[5 * 32];



	down_read(&uts_sem);

	error = -EFAULT;

	if (copy_to_user(name + 0, utsname()->sysname, 32))

		goto out;

	if (copy_to_user(name + 32, utsname()->nodename, 32))

		goto out;

	if (copy_to_user(name + 64, utsname()->release, 32))

		goto out;

	if (copy_to_user(name + 96, utsname()->version, 32))

		goto out;

	if (copy_to_user(name + 128, utsname()->machine, 32))

		goto out;



	error = 0;

 out:

	memcpy(tmp + 0 * 32, utsname()->sysname, 32);

	memcpy(tmp + 1 * 32, utsname()->nodename, 32);

	memcpy(tmp + 2 * 32, utsname()->release, 32);

	memcpy(tmp + 3 * 32, utsname()->version, 32);

	memcpy(tmp + 4 * 32, utsname()->machine, 32);

	up_read(&uts_sem);

	return error;



	if (copy_to_user(name, tmp, sizeof(tmp)))

		return -EFAULT;

	return 0;

}



SYSCALL_DEFINE0(getpagesize)
@@ -567,18 +562,21 @@ SYSCALL_DEFINE2(osf_getdomainname, char __user *, name, int, namelen) 
{

	int len, err = 0;

	char *kname;

	char tmp[32];



	if (namelen > 32)

	if (namelen < 0 || namelen > 32)

		namelen = 32;



	down_read(&uts_sem);

	kname = utsname()->domainname;

	len = strnlen(kname, namelen);

	if (copy_to_user(name, kname, min(len + 1, namelen)))

		err = -EFAULT;

	len = min(len + 1, namelen);

	memcpy(tmp, kname, len);

	up_read(&uts_sem);



	return err;

	if (copy_to_user(name, tmp, len))

		return -EFAULT;

	return 0;

}



/*
@@ -739,13 +737,14 @@ SYSCALL_DEFINE3(osf_sysinfo, int, command, char __user *, buf, long, count) 
	};

	unsigned long offset;

	const char *res;

	long len, err = -EINVAL;

	long len;

	char tmp[__NEW_UTS_LEN + 1];



	offset = command-1;

	if (offset >= ARRAY_SIZE(sysinfo_table)) {

		/* Digital UNIX has a few unpublished interfaces here */

		printk("sysinfo(%d)", command);

		goto out;

		return -EINVAL;

	}



	down_read(&uts_sem);
@@ -753,13 +752,11 @@ SYSCALL_DEFINE3(osf_sysinfo, int, command, char __user *, buf, long, count) 
	len = strlen(res)+1;

	if ((unsigned long)len > (unsigned long)count)

		len = count;

	if (copy_to_user(buf, res, len))

		err = -EFAULT;

	else

		err = 0;

	memcpy(tmp, res, len);

	up_read(&uts_sem);

 out:

	return err;

	if (copy_to_user(buf, tmp, len))

		return -EFAULT;

	return 0;

}



SYSCALL_DEFINE5(osf_getsysinfo, unsigned long, op, void __user *, buffer,

arch/arm/boot/dts/tegra30-cardhu.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -206,6 +206,7 @@ 
			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0x70>;

			reset-gpio = <&gpio TEGRA_GPIO(BB, 0) GPIO_ACTIVE_LOW>;

		};

	};

arch/arm64/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -693,7 +693,6 @@ config NEED_PER_CPU_EMBED_FIRST_CHUNK 


config HOLES_IN_ZONE

	def_bool y

	depends on NUMA



source kernel/Kconfig.preempt

source kernel/Kconfig.hz

arch/powerpc/include/asm/fadump.h

+0 −3
Original line number Diff line number Diff line
@@ -195,9 +195,6 @@ struct fadump_crash_info_header { 
	struct cpumask	online_mask;

};



/* Crash memory ranges */

#define INIT_CRASHMEM_RANGES	(INIT_MEMBLOCK_REGIONS + 2)



struct fad_crash_memory_ranges {

	unsigned long long	base;

	unsigned long long	size;