Commit 45728c3f authored May 30, 2019 by jianzhou

Merge android-4.9.169 (1ef64dae) into msm-4.9



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

Conflicts:
	drivers/tty/Kconfig

Change-Id: Ic2f7a4f7bd94d8345c34293bf933b2ed13680155
Signed-off-by: jianzhou <jianzhou@codeaurora.org>

parents 685434dc 4ebd139e

Makefile

+4 −8

Original line number	Diff line number	Diff line
		VERSION = 4
		PATCHLEVEL = 9
		SUBLEVEL = 168
		SUBLEVEL = 169
		EXTRAVERSION =
		NAME = Roaring Lionus

		@@ -511,12 +511,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
		@@ -720,7 +716,7 @@ export LDFINAL_vmlinux LDFLAGS_FINAL_vmlinux
		endif

		ifdef CONFIG_CFI_CLANG
		cfi-clang-flags += -fsanitize=cfi
		cfi-clang-flags += -fsanitize=cfi $(call cc-option, -fsplit-lto-unit)
		DISABLE_CFI_CLANG := -fno-sanitize=cfi
		ifdef CONFIG_MODULES
		cfi-clang-flags += -fsanitize-cfi-cross-dso

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

100644 → 100755

+7 −7

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" \
		@@ -56,23 +56,23 @@ arch_futex_atomic_op_inuser(int op, int oparg, int oval, u32 __user uaddr)

		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/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 */

arch/parisc/kernel/process.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -206,12 +206,6 @@ void __cpuidle arch_cpu_idle(void)

		static int __init parisc_idle_init(void)
		{
		const char *marker;

		/* check QEMU/SeaBIOS marker in PAGE0 */
		marker = (char *) &PAGE0->pad0;
		running_on_qemu = (memcmp(marker, "SeaBIOS", 8) == 0);

		if (!running_on_qemu)
		cpu_idle_poll_ctrl(1);