Commit d7b187a8 authored Jun 13, 2019 by jianzhou

Merge android-4.9.179 (1dc2c291) into msm-4.9



* refs/heads/tmp-1dc2c291:
  Linux 4.9.179
  fbdev: sm712fb: fix memory frequency by avoiding a switch/case fallthrough
  btrfs: Honour FITRIM range constraints during free space trim
  md/raid: raid5 preserve the writeback action after the parity check
  Revert "Don't jump to compute_result state from check_result state"
  perf bench numa: Add define for RUSAGE_THREAD if not present
  ufs: fix braino in ufs_get_inode_gid() for solaris UFS flavour
  power: supply: sysfs: prevent endless uevent loop with CONFIG_POWER_SUPPLY_DEBUG
  KVM: arm/arm64: Ensure vcpu target is unset on reset failure
  mac80211: Fix kernel panic due to use of txq after free
  xfrm4: Fix uninitialized memory read in _decode_session4
  vti4: ipip tunnel deregistration fixes.
  xfrm6_tunnel: Fix potential panic when unloading xfrm6_tunnel module
  xfrm: policy: Fix out-of-bound array accesses in __xfrm_policy_unlink
  dm delay: fix a crash when invalid device is specified
  PCI: Work around Pericom PCIe-to-PCI bridge Retrain Link erratum
  PCI: Factor out pcie_retrain_link() function
  PCI: Mark Atheros AR9462 to avoid bus reset
  fbdev: sm712fb: fix crashes and garbled display during DPMS modesetting
  fbdev: sm712fb: use 1024x768 by default on non-MIPS, fix garbled display
  fbdev: sm712fb: fix support for 1024x768-16 mode
  fbdev: sm712fb: fix crashes during framebuffer writes by correctly mapping VRAM
  fbdev: sm712fb: fix boot screen glitch when sm712fb replaces VGA
  fbdev: sm712fb: fix white screen of death on reboot, don't set CR3B-CR3F
  fbdev: sm712fb: fix VRAM detection, don't set SR70/71/74/75
  fbdev: sm712fb: fix brightness control on reboot, don't set SR30
  objtool: Allow AR to be overridden with HOSTAR
  perf intel-pt: Fix sample timestamp wrt non-taken branches
  perf intel-pt: Fix improved sample timestamp
  perf intel-pt: Fix instructions sampling rate
  memory: tegra: Fix integer overflow on tick value calculation
  tracing: Fix partial reading of trace event's id file
  ceph: flush dirty inodes before proceeding with remount
  iommu/tegra-smmu: Fix invalid ASID bits on Tegra30/114
  fuse: honor RLIMIT_FSIZE in fuse_file_fallocate
  fuse: fix writepages on 32bit
  clk: tegra: Fix PLLM programming on Tegra124+ when PMC overrides divider
  NFS4: Fix v4.0 client state corruption when mount
  media: ov6650: Fix sensor possibly not detected on probe
  cifs: fix strcat buffer overflow and reduce raciness in smb21_set_oplock_level()
  of: fix clang -Wunsequenced for be32_to_cpu()
  p54: drop device reference count if fails to enable device
  intel_th: msu: Fix single mode with IOMMU
  md: add mddev->pers to avoid potential NULL pointer dereference
  stm class: Fix channel free in stm output free path
  parisc: Rename LEVEL to PA_ASM_LEVEL to avoid name clash with DRBD code
  parisc: Skip registering LED when running in QEMU
  parisc: Export running_on_qemu symbol for modules
  vsock/virtio: Initialize core virtio vsock before registering the driver
  tipc: fix modprobe tipc failed after switch order of device registration
  vsock/virtio: free packets during the socket release
  tipc: switch order of device registration to fix a crash
  ppp: deflate: Fix possible crash in deflate_init
  net/mlx4_core: Change the error print to info print
  net: avoid weird emergency message
  BACKPORT: gcov: clang support
  UPSTREAM: gcov: docs: add a note on GCC vs Clang differences
  UPSTREAM: gcov: clang: move common GCC code into gcc_base.c
  UPSTREAM: module: add stubs for within_module functions
  UPSTREAM: gcov: remove CONFIG_GCOV_FORMAT_AUTODETECT
  BACKPORT: kbuild: gcov: enable -fno-tree-loop-im if supported
  ext4: fix build warning

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

parents 83b8ce09 1dc2c291

Documentation/dev-tools/gcov.rst

+14 −4

Original line number	Diff line number	Diff line
		@@ -34,10 +34,6 @@ Configure the kernel with::
		CONFIG_DEBUG_FS=y
		CONFIG_GCOV_KERNEL=y

		select the gcc's gcov format, default is autodetect based on gcc version::

		CONFIG_GCOV_FORMAT_AUTODETECT=y

		and to get coverage data for the entire kernel::

		CONFIG_GCOV_PROFILE_ALL=y
		@@ -169,6 +165,20 @@ b) gcov is run on the BUILD machine
		[user@build] gcov -o /tmp/coverage/tmp/out/init main.c


		Note on compilers
		-----------------

		GCC and LLVM gcov tools are not necessarily compatible. Use gcov_ to work with
		GCC-generated .gcno and .gcda files, and use llvm-cov_ for Clang.

		.. _gcov: http://gcc.gnu.org/onlinedocs/gcc/Gcov.html
		.. _llvm-cov: https://llvm.org/docs/CommandGuide/llvm-cov.html

		Build differences between GCC and Clang gcov are handled by Kconfig. It
		automatically selects the appropriate gcov format depending on the detected
		toolchain.


		Troubleshooting
		---------------

Makefile

+4 −2

Original line number	Diff line number	Diff line
		VERSION = 4
		PATCHLEVEL = 9
		SUBLEVEL = 178
		SUBLEVEL = 179
		EXTRAVERSION =
		NAME = Roaring Lionus

		@@ -662,7 +662,9 @@ all: vmlinux

		KBUILD_CFLAGS += $(call cc-option,-fno-PIE)
		KBUILD_AFLAGS += $(call cc-option,-fno-PIE)
		CFLAGS_GCOV := -fprofile-arcs -ftest-coverage -fno-tree-loop-im $(call cc-disable-warning,maybe-uninitialized,)
		CFLAGS_GCOV := -fprofile-arcs -ftest-coverage \
		$(call cc-option,-fno-tree-loop-im) \
		$(call cc-disable-warning,maybe-uninitialized,)
		CFLAGS_KCOV := $(call cc-option,-fsanitize-coverage=trace-pc,)
		export CFLAGS_GCOV CFLAGS_KCOV

arch/arm/kvm/arm.c

+8 −3

Original line number	Diff line number	Diff line
		@@ -801,7 +801,7 @@ int kvm_vm_ioctl_irq_line(struct kvm kvm, struct kvm_irq_level irq_level,
		static int kvm_vcpu_set_target(struct kvm_vcpu *vcpu,
		const struct kvm_vcpu_init *init)
		{
		unsigned int i;
		unsigned int i, ret;
		int phys_target = kvm_target_cpu();

		if (init->target != phys_target)
		@@ -836,9 +836,14 @@ static int kvm_vcpu_set_target(struct kvm_vcpu *vcpu,
		vcpu->arch.target = phys_target;

		/* Now we know what it is, we can reset it. */
		return kvm_reset_vcpu(vcpu);
		ret = kvm_reset_vcpu(vcpu);
		if (ret) {
		vcpu->arch.target = -1;
		bitmap_zero(vcpu->arch.features, KVM_VCPU_MAX_FEATURES);
		}

		return ret;
		}

		static int kvm_arch_vcpu_ioctl_vcpu_init(struct kvm_vcpu *vcpu,
		struct kvm_vcpu_init *init)

arch/parisc/include/asm/assembly.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -59,14 +59,14 @@
		#define LDCW ldcw,co
		#define BL b,l
		# ifdef CONFIG_64BIT
		# define LEVEL 2.0w
		# define PA_ASM_LEVEL 2.0w
		# else
		# define LEVEL 2.0
		# define PA_ASM_LEVEL 2.0
		# endif
		#else
		#define LDCW ldcw
		#define BL bl
		#define LEVEL 1.1
		#define PA_ASM_LEVEL 1.1
		#endif

		#ifdef __ASSEMBLY__

arch/parisc/kernel/head.S

+2 −2

Original line number	Diff line number	Diff line
		@@ -22,7 +22,7 @@
		#include <linux/linkage.h>
		#include <linux/init.h>

		.level LEVEL
		.level PA_ASM_LEVEL

		__INITDATA
		ENTRY(boot_args)
		@@ -254,7 +254,7 @@ stext_pdc_ret:
		ldo R%PA(fault_vector_11)(%r10),%r10

		$is_pa20:
		.level LEVEL /* restore 1.1 \|\| 2.0w */
		.level PA_ASM_LEVEL /* restore 1.1 \|\| 2.0w */
		#endif /!CONFIG_64BIT/
		load32 PA(fault_vector_20),%r10