Commit d30c59c6 authored Jul 11, 2019 by Srinivasarao P

Merge android-4.4.185 (14e11966) into msm-4.4



* refs/heads/tmp-14e11966
  ANDROID: Communicates LMK events to userland where they can be logged
  Linux 4.4.185
  dmaengine: imx-sdma: remove BD_INTR for channel0
  KVM: x86: degrade WARN to pr_warn_ratelimited
  arm64, vdso: Define vdso_{start,end} as array
  ARC: handle gcc generated __builtin_trap for older compiler
  tty: rocket: fix incorrect forward declaration of 'rp_init()'
  btrfs: Ensure replaced device doesn't have pending chunk allocation
  lib/mpi: Fix karactx leak in mpi_powm
  ALSA: usb-audio: fix sign unintended sign extension on left shifts
  ALSA: firewire-lib/fireworks: fix miss detection of received MIDI messages
  ALSA: seq: fix incorrect order of dest_client/dest_ports arguments
  crypto: user - prevent operating on larval algorithms
  ptrace: Fix ->ptracer_cred handling for PTRACE_TRACEME
  MIPS: Workaround GCC __builtin_unreachable reordering bug
  bug.h: work around GCC PR82365 in BUG()
  swiotlb: Make linux/swiotlb.h standalone includible
  mfd: omap-usb-tll: Fix register offsets
  MIPS: math-emu: do not use bools for arithmetic
  ARC: fix build warning in elf.h
  ARC: Assume multiplier is always present
  scsi: hpsa: correct ioaccel2 chaining
  usb: gadget: udc: lpc32xx: allocate descriptor with GFP_ATOMIC
  usb: gadget: fusb300_udc: Fix memory leak of fusb300->ep[i]
  ASoC: max98090: remove 24-bit format support if RJ is 0
  spi: bitbang: Fix NULL pointer dereference in spi_unregister_master
  ASoC : cs4265 : readable register too low
  um: Compile with modern headers
  Bluetooth: Fix faulty expression for minimum encryption key size check
  net: check before dereferencing netdev_ops during busy poll
  bonding: Always enable vlan tx offload
  ipv4: Use return value of inet_iif() for __raw_v4_lookup in the while loop
  team: Always enable vlan tx offload
  tipc: check msg->req data len in tipc_nl_compat_bearer_disable
  tipc: change to use register_pernet_device
  sctp: change to hold sk after auth shkey is created successfully
  cpu/speculation: Warn on unsupported mitigations= parameter
  x86/speculation: Allow guests to use SSBD even if host does not
  ovl: modify ovl_permission() to do checks on two inodes
  KVM: X86: Fix scan ioapic use-before-initialization
  net/9p: include trans_common.h to fix missing prototype warning.
  9p: p9dirent_read: check network-provided name length
  9p/rdma: remove useless check in cm_event_handler
  9p: acl: fix uninitialized iattr access
  9p/rdma: do not disconnect on down_interruptible EAGAIN
  perf help: Remove needless use of strncpy()
  perf ui helpline: Use strlcpy() as a shorter form of strncpy() + explicit set nul
  mac80211: drop robust management frames from unknown TA
  cfg80211: fix memory leak of wiphy device name
  SMB3: retry on STATUS_INSUFFICIENT_RESOURCES instead of failing write
  Bluetooth: Fix regression with minimum encryption key size alignment
  Bluetooth: Align minimum encryption key size for LE and BR/EDR connections
  ARM: imx: cpuidle-imx6sx: Restrict the SW2ISO increase to i.MX6SX
  can: purge socket error queue on sock destruct
  can: flexcan: fix timeout when set small bitrate
  btrfs: start readahead also in seed devices
  Btrfs: fix race between readahead and device replace/removal
  hwmon: (pmbus/core) Treat parameters as paged if on multiple pages
  s390/qeth: fix VLAN attribute in bridge_hostnotify udev event
  scsi: ufs: Check that space was properly alloced in copy_query_response
  scripts/checkstack.pl: Fix arm64 wrong or unknown architecture
  sparc: perf: fix updated event period in response to PERF_EVENT_IOC_PERIOD
  net: hns: Fix loopback test failed at copper ports
  MIPS: uprobes: remove set but not used variable 'epc'
  IB/hfi1: Insure freeze_work work_struct is canceled on shutdown
  parisc: Fix compiler warnings in float emulation code
  parport: Fix mem leak in parport_register_dev_model
  apparmor: enforce nullbyte at end of tag string
  Input: uinput - add compat ioctl number translation for UI_*_FF_UPLOAD
  usb: chipidea: udc: workaround for endpoint conflict issue
  gcc-9: silence 'address-of-packed-member' warning
  tracing: Silence GCC 9 array bounds warning
  scsi: vmw_pscsi: Fix use-after-free in pvscsi_queue_lck()
  mm/page_idle.c: fix oops because end_pfn is larger than max_pfn
  fs/binfmt_flat.c: make load_flat_shared_library() work
  ANDROID: Fixes to locking around handle_lmk_event
  ANDROID: Avoid taking multiple locks in handle_lmk_event

Side effects from the commit "ANDROID: Communicates LMK events to userland
where they can be logged" is addressed here, so picking this commit which
ignored from 4.4.180 merge.

Conflicts:
	drivers/staging/android/lowmemorykiller.c

Change-Id: I1156dc21d0f35e74e86d2ad202f99b7bc173b874
Signed-off-by: Srinivasarao P <spathi@codeaurora.org>

parents 6355b448 14e11966

Makefile

+2 −2

Original line number	Diff line number	Diff line
		VERSION = 4
		PATCHLEVEL = 4
		SUBLEVEL = 184
		SUBLEVEL = 185
		EXTRAVERSION =
		NAME = Blurry Fish Butt

		@@ -648,6 +648,7 @@ KBUILD_CFLAGS += $(call cc-disable-warning,frame-address,)
		KBUILD_CFLAGS += $(call cc-disable-warning, format-truncation)
		KBUILD_CFLAGS += $(call cc-disable-warning, format-overflow)
		KBUILD_CFLAGS += $(call cc-disable-warning, int-in-bool-context)
		KBUILD_CFLAGS += $(call cc-disable-warning, address-of-packed-member)
		KBUILD_CFLAGS += $(call cc-disable-warning, attribute-alias)

		ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
		@@ -732,7 +733,6 @@ ifeq ($(cc-name),clang)
		KBUILD_CPPFLAGS += $(call cc-option,-Qunused-arguments,)
		KBUILD_CFLAGS += $(call cc-disable-warning, format-invalid-specifier)
		KBUILD_CFLAGS += $(call cc-disable-warning, gnu)
		KBUILD_CFLAGS += $(call cc-disable-warning, address-of-packed-member)
		KBUILD_CFLAGS += $(call cc-disable-warning, duplicate-decl-specifier)
		# Quiet clang warning: comparison of unsigned expression < 0 is always false
		KBUILD_CFLAGS += $(call cc-disable-warning, tautological-compare)

arch/arc/Kconfig

+0 −8

Original line number	Diff line number	Diff line
		@@ -278,14 +278,6 @@ config ARC_DCCM_BASE
		default "0xA0000000"
		depends on ARC_HAS_DCCM

		config ARC_HAS_HW_MPY
		bool "Use Hardware Multiplier (Normal or Faster XMAC)"
		default y
		help
		Influences how gcc generates code for MPY operations.
		If enabled, MPYxx insns are generated, provided by Standard/XMAC
		Multipler. Otherwise software multipy lib is used

		choice
		prompt "MMU Version"
		default ARC_MMU_V3 if ARC_CPU_770

arch/arc/Makefile

+0 −4

Original line number	Diff line number	Diff line
		@@ -72,10 +72,6 @@ ldflags-$(CONFIG_CPU_BIG_ENDIAN) += -EB
		# --build-id w/o "-marclinux". Default arc-elf32-ld is OK
		ldflags-$(upto_gcc44) += -marclinux

		ifndef CONFIG_ARC_HAS_HW_MPY
		cflags-y += -mno-mpy
		endif

		LIBGCC := $(shell $(CC) $(cflags-y) --print-libgcc-file-name)

		# Modules with short calls might break for calls into builtin-kernel

arch/arc/include/asm/bug.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,8 @@ void die(const char str, struct pt_regs regs, unsigned long address);

		#define BUG() do { \
		pr_warn("BUG: failure at %s:%d/%s()!\n", __FILE__, __LINE__, __func__); \
		dump_stack(); \
		barrier_before_unreachable(); \
		__builtin_trap(); \
		} while (0)

		#define HAVE_ARCH_BUG

arch/arc/include/asm/elf.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -55,7 +55,7 @@ extern int elf_check_arch(const struct elf32_hdr *);
		* the loader. We need to make sure that it is out of the way of the program
		* that it will "exec", and that there is sufficient room for the brk.
		*/
		#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3)
		#define ELF_ET_DYN_BASE (2UL * TASK_SIZE / 3)

		/*
		* When the program starts, a1 contains a pointer to a function to be