Commit bf3b3398 authored Jan 23, 2018 by Greg Kroah-Hartman

Merge 4.9.78 into android-4.9-o



Changes in 4.9.78
	libnvdimm, btt: Fix an incompatibility in the log layout
	scsi: sg: disable SET_FORCE_LOW_DMA
	futex: Prevent overflow by strengthen input validation
	ALSA: seq: Make ioctls race-free
	ALSA: pcm: Remove yet superfluous WARN_ON()
	ALSA: hda - Apply headphone noise quirk for another Dell XPS 13 variant
	ALSA: hda - Apply the existing quirk to iMac 14,1
	timers: Unconditionally check deferrable base
	af_key: fix buffer overread in verify_address_len()
	af_key: fix buffer overread in parse_exthdrs()
	iser-target: Fix possible use-after-free in connection establishment error
	scsi: hpsa: fix volume offline state
	sched/deadline: Zero out positive runtime after throttling constrained tasks
	x86/retpoline: Fill RSB on context switch for affected CPUs
	x86/retpoline: Add LFENCE to the retpoline/RSB filling RSB macros
	objtool: Improve error message for bad file argument
	x86/cpufeature: Move processor tracing out of scattered features
	module: Add retpoline tag to VERMAGIC
	x86/mm/pkeys: Fix fill_sig_info_pkey
	x86/tsc: Fix erroneous TSC rate on Skylake Xeon
	pipe: avoid round_pipe_size() nr_pages overflow on 32-bit
	x86/apic/vector: Fix off by one in error path
	perf tools: Fix build with ARCH=x86_64
	Input: ALPS - fix multi-touch decoding on SS4 plus touchpads
	Input: 88pm860x-ts - fix child-node lookup
	Input: twl6040-vibra - fix child-node lookup
	Input: twl4030-vibra - fix sibling-node lookup
	tracing: Fix converting enum's from the map in trace_event_eval_update()
	phy: work around 'phys' references to usb-nop-xceiv devices
	ARM: sunxi_defconfig: Enable CMA
	ARM: dts: kirkwood: fix pin-muxing of MPP7 on OpenBlocks A7
	can: peak: fix potential bug in packet fragmentation
	scripts/gdb/linux/tasks.py: fix get_thread_info
	proc: fix coredump vs read /proc/*/stat race
	libata: apply MAX_SEC_1024 to all LITEON EP1 series devices
	workqueue: avoid hard lockups in show_workqueue_state()
	dm btree: fix serious bug in btree_split_beneath()
	dm thin metadata: THIN_MAX_CONCURRENT_LOCKS should be 6
	arm64: KVM: Fix SMCCC handling of unimplemented SMC/HVC calls
	x86/cpu, x86/pti: Do not enable PTI on AMD processors
	usbip: fix warning in vhci_hcd_probe/lockdep_init_map
	x86/mce: Make machine check speculation protected
	retpoline: Introduce start/end markers of indirect thunk
	kprobes/x86: Blacklist indirect thunk functions for kprobes
	kprobes/x86: Disable optimizing on the function jumps to indirect thunk
	x86/pti: Document fix wrong index
	x86/retpoline: Optimize inline assembler for vmexit_fill_RSB
	MIPS: AR7: ensure the port type's FCR value is used
	Linux 4.9.78

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

parents 874f7781 79584a42

Documentation/x86/pti.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -78,7 +78,7 @@ this protection comes at a cost:
		non-PTI SYSCALL entry code, so requires mapping fewer
		things into the userspace page tables. The downside is
		that stacks must be switched at entry time.
		d. Global pages are disabled for all kernel structures not
		c. Global pages are disabled for all kernel structures not
		mapped into both kernel and userspace page tables. This
		feature of the MMU allows different processes to share TLB
		entries mapping the kernel. Losing the feature means more

Makefile

+1 −1

Original line number	Diff line number	Diff line
		VERSION = 4
		PATCHLEVEL = 9
		SUBLEVEL = 77
		SUBLEVEL = 78
		EXTRAVERSION =
		NAME = Roaring Lionus

arch/arm/boot/dts/kirkwood-openblocks_a7.dts

+8 −2

Original line number	Diff line number	Diff line
		@@ -53,7 +53,8 @@
		};

		pinctrl: pin-controller@10000 {
		pinctrl-0 = <&pmx_dip_switches &pmx_gpio_header>;
		pinctrl-0 = <&pmx_dip_switches &pmx_gpio_header
		&pmx_gpio_header_gpo>;
		pinctrl-names = "default";

		pmx_uart0: pmx-uart0 {
		@@ -85,11 +86,16 @@
		* ground.
		*/
		pmx_gpio_header: pmx-gpio-header {
		marvell,pins = "mpp17", "mpp7", "mpp29", "mpp28",
		marvell,pins = "mpp17", "mpp29", "mpp28",
		"mpp35", "mpp34", "mpp40";
		marvell,function = "gpio";
		};

		pmx_gpio_header_gpo: pxm-gpio-header-gpo {
		marvell,pins = "mpp7";
		marvell,function = "gpo";
		};

		pmx_gpio_init: pmx-init {
		marvell,pins = "mpp38";
		marvell,function = "gpio";

arch/arm/configs/sunxi_defconfig

+2 −0

Original line number	Diff line number	Diff line
		@@ -11,6 +11,7 @@ CONFIG_SMP=y
		CONFIG_NR_CPUS=8
		CONFIG_AEABI=y
		CONFIG_HIGHMEM=y
		CONFIG_CMA=y
		CONFIG_ARM_APPENDED_DTB=y
		CONFIG_ARM_ATAG_DTB_COMPAT=y
		CONFIG_CPU_FREQ=y
		@@ -35,6 +36,7 @@ CONFIG_CAN_SUN4I=y
		# CONFIG_WIRELESS is not set
		CONFIG_DEVTMPFS=y
		CONFIG_DEVTMPFS_MOUNT=y
		CONFIG_DMA_CMA=y
		CONFIG_BLK_DEV_SD=y
		CONFIG_ATA=y
		CONFIG_AHCI_SUNXI=y

arch/arm64/kvm/handle_exit.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -44,7 +44,7 @@ static int handle_hvc(struct kvm_vcpu vcpu, struct kvm_run run)

		ret = kvm_psci_call(vcpu);
		if (ret < 0) {
		kvm_inject_undefined(vcpu);
		vcpu_set_reg(vcpu, 0, ~0UL);
		return 1;
		}

		@@ -53,7 +53,7 @@ static int handle_hvc(struct kvm_vcpu vcpu, struct kvm_run run)

		static int handle_smc(struct kvm_vcpu vcpu, struct kvm_run run)
		{
		kvm_inject_undefined(vcpu);
		vcpu_set_reg(vcpu, 0, ~0UL);
		return 1;
		}