Commit 7b323f5e authored May 30, 2019 by jianzhou

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



* refs/heads/tmp-1ef64dae:
  Linux 4.9.170
  appletalk: Fix compile regression
  net: stmmac: Set dma ring length before enabling the DMA
  tpm/tpm_crb: Avoid unaligned reads in crb_recv()
  include/linux/swap.h: use offsetof() instead of custom __swapoffset macro
  lib/div64.c: off by one in shift
  appletalk: Fix use-after-free in atalk_proc_exit
  ARM: 8839/1: kprobe: make patch_lock a raw_spinlock_t
  lkdtm: Add tests for NULL pointer dereference
  soc/tegra: pmc: Drop locking from tegra_powergate_is_powered()
  iommu/dmar: Fix buffer overflow during PCI bus notification
  crypto: sha512/arm - fix crash bug in Thumb2 build
  crypto: sha256/arm - fix crash bug in Thumb2 build
  kernel: hung_task.c: disable on suspend
  cifs: fallback to older infolevels on findfirst queryinfo retry
  ACPI / SBS: Fix GPE storm on recent MacBookPro's
  ARM: samsung: Limit SAMSUNG_PM_CHECK config option to non-Exynos platforms
  HID: i2c-hid: override HID descriptors for certain devices
  serial: uartps: console_setup() can't be placed to init section
  f2fs: fix to do sanity check with current segment number
  9p locks: add mount option for lock retry interval
  9p: do not trust pdu content for stat item size
  rsi: improve kernel thread handling to fix kernel panic
  gpio: pxa: handle corner case of unprobed device
  ext4: prohibit fstrim in norecovery mode
  fix incorrect error code mapping for OBJECTID_NOT_FOUND
  x86/hw_breakpoints: Make default case in hw_breakpoint_arch_parse() return an error
  iommu/vt-d: Check capability before disabling protected memory
  x86/cpu/cyrix: Use correct macros for Cyrix calls on Geode processors
  x86/hpet: Prevent potential NULL pointer dereference
  irqchip/mbigen: Don't clear eventid when freeing an MSI
  perf tests: Fix a memory leak in test__perf_evsel__tp_sched_test()
  perf tests: Fix a memory leak of cpu_map object in the openat_syscall_event_on_all_cpus test
  perf evsel: Free evsel->counts in perf_evsel__exit()
  perf hist: Add missing map__put() in error case
  perf top: Fix error handling in cmd_top()
  perf build-id: Fix memory leak in print_sdt_events()
  perf config: Fix a memory leak in collect_config()
  perf config: Fix an error in the config template documentation
  tools/power turbostat: return the exit status of a command
  thermal/int340x_thermal: fix mode setting
  thermal/int340x_thermal: Add additional UUIDs
  ALSA: opl3: fix mismatch between snd_opl3_drum_switch definition and declaration
  mmc: davinci: remove extraneous __init annotation
  IB/mlx4: Fix race condition between catas error reset and aliasguid flows
  ALSA: sb8: add a check for request_region
  ALSA: echoaudio: add a check for ioremap_nocache
  ext4: report real fs size after failed resize
  ext4: add missing brelse() in add_new_gdb_meta_bg()
  perf/core: Restore mmap record type correctly
  ARC: u-boot args: check that magic number is correct
  ANDROID: cuttlefish_defconfig: Enable L2TP/PPTP
  ANDROID: Makefile: Properly resolve 4.9.169 merge
  Make arm64 serial port config compatible with crosvm

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

parents 45728c3f 1ef64dae

Makefile

+6 −2

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

		@@ -511,7 +511,11 @@ endif

		ifeq ($(cc-name),clang)
		ifneq ($(CROSS_COMPILE),)
		CLANG_FLAGS := --target=$(notdir $(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 $(CROSS_COMPILE)elfedit))
		CLANG_FLAGS += --prefix=$(GCC_TOOLCHAIN_DIR)
		GCC_TOOLCHAIN := $(realpath $(GCC_TOOLCHAIN_DIR)/..)

arch/arc/kernel/head.S

+1 −0

Original line number	Diff line number	Diff line
		@@ -107,6 +107,7 @@ ENTRY(stext)
		; r2 = pointer to uboot provided cmdline or external DTB in mem
		; These are handled later in handle_uboot_args()
		st r0, [@uboot_tag]
		st r1, [@uboot_magic]
		st r2, [@uboot_arg]
		#endif

arch/arc/kernel/setup.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@ unsigned int intr_to_DE_cnt;

		/* Part of U-boot ABI: see head.S */
		int __initdata uboot_tag;
		int __initdata uboot_magic;
		char __initdata *uboot_arg;

		const struct machine_desc *machine_desc;
		@@ -400,6 +401,8 @@ static inline bool uboot_arg_invalid(unsigned long addr)
		#define UBOOT_TAG_NONE 0
		#define UBOOT_TAG_CMDLINE 1
		#define UBOOT_TAG_DTB 2
		/* We always pass 0 as magic from U-boot */
		#define UBOOT_MAGIC_VALUE 0

		void __init handle_uboot_args(void)
		{
		@@ -415,6 +418,11 @@ void __init handle_uboot_args(void)
		goto ignore_uboot_args;
		}

		if (uboot_magic != UBOOT_MAGIC_VALUE) {
		pr_warn(IGNORE_ARGS "non zero uboot magic\n");
		goto ignore_uboot_args;
		}

		if (uboot_tag != UBOOT_TAG_NONE &&
		uboot_arg_invalid((unsigned long)uboot_arg)) {
		pr_warn(IGNORE_ARGS "invalid uboot arg: '%px'\n", uboot_arg);

arch/arm/crypto/sha256-armv4.pl

+2 −1

Original line number	Diff line number	Diff line
		@@ -205,10 +205,11 @@ K256:
		.global sha256_block_data_order
		.type sha256_block_data_order,%function
		sha256_block_data_order:
		.Lsha256_block_data_order:
		#if __ARM_ARCH__<7
		sub r3,pc,#8 @ sha256_block_data_order
		#else
		adr r3,sha256_block_data_order
		adr r3,.Lsha256_block_data_order
		#endif
		#if __ARM_MAX_ARCH__>=7 && !defined(__KERNEL__)
		ldr r12,.LOPENSSL_armcap

arch/arm/crypto/sha256-core.S_shipped

+2 −1

Original line number	Diff line number	Diff line
		@@ -86,10 +86,11 @@ K256:
		.global sha256_block_data_order
		.type sha256_block_data_order,%function
		sha256_block_data_order:
		.Lsha256_block_data_order:
		#if __ARM_ARCH__<7
		sub r3,pc,#8 @ sha256_block_data_order
		#else
		adr r3,sha256_block_data_order
		adr r3,.Lsha256_block_data_order
		#endif
		#if __ARM_MAX_ARCH__>=7 && !defined(__KERNEL__)
		ldr r12,.LOPENSSL_armcap