Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ebd139e authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.9.169 into android-4.9 



Changes in 4.9.169
	x86/power: Fix some ordering bugs in __restore_processor_context()
	x86/power/64: Use struct desc_ptr for the IDT in struct saved_context
	x86/power/32: Move SYSENTER MSR restoration to fix_processor_context()
	x86/power: Make restore_processor_context() sane
	powerpc/tm: Limit TM code inside PPC_TRANSACTIONAL_MEM
	kbuild: clang: choose GCC_TOOLCHAIN_DIR not on LD
	x86: vdso: Use $LD instead of $CC to link
	x86/vdso: Drop implicit common-page-size linker flag
	lib/string.c: implement a basic bcmp
	powerpc: Fix invalid use of register expressions
	powerpc/64s: Add barrier_nospec
	powerpc/64s: Add support for ori barrier_nospec patching
	powerpc: Avoid code patching freed init sections
	powerpc/64s: Patch barrier_nospec in modules
	powerpc/64s: Enable barrier_nospec based on firmware settings
	powerpc: Use barrier_nospec in copy_from_user()
	powerpc/64: Use barrier_nospec in syscall entry
	powerpc/64s: Enhance the information in cpu_show_spectre_v1()
	powerpc64s: Show ori31 availability in spectre_v1 sysfs file not v2
	powerpc/64: Disable the speculation barrier from the command line
	powerpc/64: Make stf barrier PPC_BOOK3S_64 specific.
	powerpc/64: Add CONFIG_PPC_BARRIER_NOSPEC
	powerpc/64: Call setup_barrier_nospec() from setup_arch()
	powerpc/64: Make meltdown reporting Book3S 64 specific
	powerpc/fsl: Add barrier_nospec implementation for NXP PowerPC Book3E
	powerpc/fsl: Sanitize the syscall table for NXP PowerPC 32 bit platforms
	powerpc/asm: Add a patch_site macro & helpers for patching instructions
	powerpc/64s: Add new security feature flags for count cache flush
	powerpc/64s: Add support for software count cache flush
	powerpc/pseries: Query hypervisor for count cache flush settings
	powerpc/powernv: Query firmware for count cache flush settings
	powerpc/fsl: Add infrastructure to fixup branch predictor flush
	powerpc/fsl: Add macro to flush the branch predictor
	powerpc/fsl: Fix spectre_v2 mitigations reporting
	powerpc/fsl: Emulate SPRN_BUCSR register
	powerpc/fsl: Add nospectre_v2 command line argument
	powerpc/fsl: Flush the branch predictor at each kernel entry (64bit)
	powerpc/fsl: Flush the branch predictor at each kernel entry (32 bit)
	powerpc/fsl: Flush branch predictor when entering KVM
	powerpc/fsl: Enable runtime patching if nospectre_v2 boot arg is used
	powerpc/fsl: Update Spectre v2 reporting
	powerpc/fsl: Fixed warning: orphan section `__btb_flush_fixup'
	powerpc/fsl: Fix the flush of branch predictor.
	powerpc/security: Fix spectre_v2 reporting
	arm64: kaslr: Reserve size of ARM64_MEMSTART_ALIGN in linear region
	tty: mark Siemens R3964 line discipline as BROKEN
	tty: ldisc: add sysctl to prevent autoloading of ldiscs
	ipv6: Fix dangling pointer when ipv6 fragment
	ipv6: sit: reset ip header pointer in ipip6_rcv
	kcm: switch order of device registration to fix a crash
	net: rds: force to destroy connection if t_sock is NULL in rds_tcp_kill_sock().
	openvswitch: fix flow actions reallocation
	qmi_wwan: add Olicard 600
	sctp: initialize _pad of sockaddr_in before copying to user memory
	tcp: Ensure DCTCP reacts to losses
	vrf: check accept_source_route on the original netdevice
	bnxt_en: Reset device on RX buffer errors.
	bnxt_en: Improve RX consumer index validity check.
	net/mlx5e: Add a lock on tir list
	netns: provide pure entropy for net_hash_mix()
	net: ethtool: not call vzalloc for zero sized memory request
	ip6_tunnel: Match to ARPHRD_TUNNEL6 for dev type
	ALSA: seq: Fix OOB-reads from strlcpy
	parisc: Detect QEMU earlier in boot process
	include/linux/bitrev.h: fix constant bitrev
	ASoC: fsl_esai: fix channel swap issue when stream starts
	Btrfs: do not allow trimming when a fs is mounted with the nologreplay option
	block: do not leak memory in bio_copy_user_iov()
	genirq: Respect IRQCHIP_SKIP_SET_WAKE in irq_chip_set_wake_parent()
	virtio: Honour 'may_reduce_num' in vring_create_virtqueue
	ARM: dts: at91: Fix typo in ISC_D0 on PC9
	arm64: futex: Fix FUTEX_WAKE_OP atomic ops with non-zero result value
	parisc: Use cr16 interval timers unconditionally on qemu
	xen: Prevent buffer overflow in privcmd ioctl
	sched/fair: Do not re-read ->h_load_next during hierarchical load calculation
	xtensa: fix return_address
	PCI: Add function 1 DMA alias quirk for Marvell 9170 SATA controller
	Linux 4.9.169

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents fc67a895 df62169c

Makefile

+3 −7
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 9

SUBLEVEL = 168

SUBLEVEL = 169

EXTRAVERSION =

NAME = Roaring Lionus
@@ -507,12 +507,8 @@ endif 


ifeq ($(cc-name),clang)

ifneq ($(CROSS_COMPILE),)

CLANG_TRIPLE	?= $(CROSS_COMPILE)

CLANG_FLAGS	:= --target=$(notdir $(CLANG_TRIPLE:%-=%))

ifeq ($(shell $(srctree)/scripts/clang-android.sh $(CC) $(CLANG_FLAGS)), y)

$(error "Clang with Android --target detected. Did you specify CLANG_TRIPLE?")

endif

GCC_TOOLCHAIN_DIR := $(dir $(shell which $(LD)))

CLANG_FLAGS	:= --target=$(notdir $(CROSS_COMPILE:%-=%))

GCC_TOOLCHAIN_DIR := $(dir $(shell which $(CROSS_COMPILE)elfedit))

CLANG_FLAGS	+= --prefix=$(GCC_TOOLCHAIN_DIR)

GCC_TOOLCHAIN	:= $(realpath $(GCC_TOOLCHAIN_DIR)/..)

endif

arch/arm/boot/dts/sama5d2-pinfunc.h

+1 −1
Original line number Diff line number Diff line
@@ -517,7 +517,7 @@ 
#define PIN_PC9__GPIO			PINMUX_PIN(PIN_PC9, 0, 0)

#define PIN_PC9__FIQ			PINMUX_PIN(PIN_PC9, 1, 3)

#define PIN_PC9__GTSUCOMP		PINMUX_PIN(PIN_PC9, 2, 1)

#define PIN_PC9__ISC_D0			PINMUX_PIN(PIN_PC9, 2, 1)

#define PIN_PC9__ISC_D0			PINMUX_PIN(PIN_PC9, 3, 1)

#define PIN_PC9__TIOA4			PINMUX_PIN(PIN_PC9, 4, 2)

#define PIN_PC10			74

#define PIN_PC10__GPIO			PINMUX_PIN(PIN_PC10, 0, 0)

arch/arm64/include/asm/futex.h

+8 −8
Original line number Diff line number Diff line
@@ -30,8 +30,8 @@ do { \ 
"	prfm	pstl1strm, %2\n"					\

"1:	ldxr	%w1, %2\n"						\

	insn "\n"							\

"2:	stlxr	%w3, %w0, %2\n"						\

"	cbnz	%w3, 1b\n"						\

"2:	stlxr	%w0, %w3, %2\n"						\

"	cbnz	%w0, 1b\n"						\

"	dmb	ish\n"							\

"3:\n"									\

"	.pushsection .fixup,\"ax\"\n"					\
@@ -50,29 +50,29 @@ do { \ 
static inline int

arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr)

{

	int oldval = 0, ret, tmp;

	int oldval, ret, tmp;



	pagefault_disable();



	switch (op) {

	case FUTEX_OP_SET:

		__futex_atomic_op("mov	%w0, %w4",

		__futex_atomic_op("mov	%w3, %w4",

				  ret, oldval, uaddr, tmp, oparg);

		break;

	case FUTEX_OP_ADD:

		__futex_atomic_op("add	%w0, %w1, %w4",

		__futex_atomic_op("add	%w3, %w1, %w4",

				  ret, oldval, uaddr, tmp, oparg);

		break;

	case FUTEX_OP_OR:

		__futex_atomic_op("orr	%w0, %w1, %w4",

		__futex_atomic_op("orr	%w3, %w1, %w4",

				  ret, oldval, uaddr, tmp, oparg);

		break;

	case FUTEX_OP_ANDN:

		__futex_atomic_op("and	%w0, %w1, %w4",

		__futex_atomic_op("and	%w3, %w1, %w4",

				  ret, oldval, uaddr, tmp, ~oparg);

		break;

	case FUTEX_OP_XOR:

		__futex_atomic_op("eor	%w0, %w1, %w4",

		__futex_atomic_op("eor	%w3, %w1, %w4",

				  ret, oldval, uaddr, tmp, oparg);

		break;

	default:

arch/arm64/mm/init.c

+1 −1
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ void __init arm64_memblock_init(void) 
		 * memory spans, randomize the linear region as well.

		 */

		if (memstart_offset_seed > 0 && range >= ARM64_MEMSTART_ALIGN) {

			range = range / ARM64_MEMSTART_ALIGN + 1;

			range /= ARM64_MEMSTART_ALIGN;

			memstart_addr -= ARM64_MEMSTART_ALIGN *

					 ((range * memstart_offset_seed) >> 16);

		}

arch/parisc/include/asm/processor.h

+2 −0
Original line number Diff line number Diff line
@@ -323,6 +323,8 @@ extern int _parisc_requires_coherency; 
#define parisc_requires_coherency()	(0)

#endif



extern int running_on_qemu;



#endif /* __ASSEMBLY__ */



#endif /* __ASM_PARISC_PROCESSOR_H */