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

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

Merge 4.9.143 into android-4.9 



Changes in 4.9.143
	mm/huge_memory: rename freeze_page() to unmap_page()
	mm/huge_memory.c: reorder operations in __split_huge_page_tail()
	mm/huge_memory: splitting set mapping+index before unfreeze
	mm/huge_memory: fix lockdep complaint on 32-bit i_size_read()
	mm/khugepaged: collapse_shmem() stop if punched or truncated
	shmem: shmem_charge: verify max_block is not exceeded before inode update
	shmem: introduce shmem_inode_acct_block
	mm/khugepaged: fix crashes due to misaccounted holes
	mm/khugepaged: collapse_shmem() remember to clear holes
	mm/khugepaged: minor reorderings in collapse_shmem()
	mm/khugepaged: collapse_shmem() without freezing new_page
	mm/khugepaged: collapse_shmem() do not crash on Compound
	media: em28xx: Fix use-after-free when disconnecting
	Revert "wlcore: Add missing PM call for wlcore_cmd_wait_for_event_or_timeout()"
	net: skb_scrub_packet(): Scrub offload_fwd_mark
	rapidio/rionet: do not free skb before reading its length
	s390/qeth: fix length check in SNMP processing
	usbnet: ipheth: fix potential recvmsg bug and recvmsg bug 2
	kvm: mmu: Fix race in emulated page table writes
	kvm: svm: Ensure an IBPB on all affected CPUs when freeing a vmcb
	KVM: X86: Fix scan ioapic use-before-initialization
	xtensa: enable coprocessors that are being flushed
	xtensa: fix coprocessor context offset definitions
	Btrfs: ensure path name is null terminated at btrfs_control_ioctl
	perf/x86/intel: Move branch tracing setup to the Intel-specific source file
	perf/x86/intel: Add generic branch tracing check to intel_pmu_has_bts()
	fs: fix lost error code in dio_complete
	ALSA: wss: Fix invalid snd_free_pages() at error path
	ALSA: ac97: Fix incorrect bit shift at AC97-SPSA control write
	ALSA: control: Fix race between adding and removing a user element
	ALSA: sparc: Fix invalid snd_free_pages() at error path
	ext2: fix potential use after free
	dmaengine: at_hdmac: fix memory leak in at_dma_xlate()
	dmaengine: at_hdmac: fix module unloading
	btrfs: release metadata before running delayed refs
	USB: usb-storage: Add new IDs to ums-realtek
	usb: core: quirks: add RESET_RESUME quirk for Cherry G230 Stream series
	Revert "usb: dwc3: gadget: skip Set/Clear Halt when invalid"
	iio:st_magn: Fix enable device after trigger
	mm: use swp_offset as key in shmem_replace_page()
	Drivers: hv: vmbus: check the creation_status in vmbus_establish_gpadl()
	misc: mic/scif: fix copy-paste error in scif_create_remote_lookup
	efi/libstub: arm: support building with clang
	ARM: 8766/1: drop no-thumb-interwork in EABI mode
	ARM: 8767/1: add support for building ARM kernel with clang
	bus: arm-cci: remove unnecessary unreachable()
	ARM: trusted_foundations: do not use naked function
	workqueue: avoid clang warning
	efi/libstub: Make file I/O chunking x86-specific
	kbuild: Set KBUILD_CFLAGS before incl. arch Makefile
	Linux 4.9.143

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

Makefile

+34 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 9

SUBLEVEL = 142

SUBLEVEL = 143

EXTRAVERSION =

NAME = Roaring Lionus
@@ -510,6 +510,39 @@ ifneq ($(filter install,$(MAKECMDGOALS)),) 
        endif

endif



ifeq ($(cc-name),clang)

ifneq ($(CROSS_COMPILE),)

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

GCC_TOOLCHAIN	:= $(realpath $(dir $(shell which $(LD)))/..)

endif

ifneq ($(GCC_TOOLCHAIN),)

CLANG_GCC_TC	:= -gcc-toolchain $(GCC_TOOLCHAIN)

endif

KBUILD_CFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC)

KBUILD_AFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC)

KBUILD_CPPFLAGS += $(call cc-option,-Qunused-arguments,)

KBUILD_CFLAGS += $(call cc-disable-warning, unused-variable)

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)

# Quiet clang warning: comparison of unsigned expression < 0 is always false

KBUILD_CFLAGS += $(call cc-disable-warning, tautological-compare)

# CLANG uses a _MergedGlobals as optimization, but this breaks modpost, as the

# source of a reference will be _MergedGlobals and not on of the whitelisted names.

# See modpost pattern 2

KBUILD_CFLAGS += $(call cc-option, -mno-global-merge,)

KBUILD_CFLAGS += $(call cc-option, -fcatch-undefined-behavior)

KBUILD_CFLAGS += $(call cc-option, -no-integrated-as)

KBUILD_AFLAGS += $(call cc-option, -no-integrated-as)

else



# These warnings generated too much noise in a regular build.

# Use make W=1 to enable them (see scripts/Makefile.build)

KBUILD_CFLAGS += $(call cc-disable-warning, unused-but-set-variable)

KBUILD_CFLAGS += $(call cc-disable-warning, unused-const-variable)

endif





ifeq ($(mixed-targets),1)

# ===========================================================================

# We're called with mixed targets (*config and build targets).

arch/arm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ tune-$(CONFIG_CPU_V6K) =$(call cc-option,-mtune=arm1136j-s,-mtune=strongarm) 
tune-y := $(tune-y)



ifeq ($(CONFIG_AEABI),y)

CFLAGS_ABI	:=-mabi=aapcs-linux -mno-thumb-interwork -mfpu=vfp

CFLAGS_ABI	:=-mabi=aapcs-linux -mfpu=vfp

else

CFLAGS_ABI	:=$(call cc-option,-mapcs-32,-mabi=apcs-gnu) $(call cc-option,-mno-thumb-interwork,)

endif

arch/arm/boot/compressed/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ CFLAGS_fdt_ro.o := $(nossp_flags) 
CFLAGS_fdt_rw.o := $(nossp_flags)

CFLAGS_fdt_wip.o := $(nossp_flags)



ccflags-y := -fpic -mno-single-pic-base -fno-builtin -I$(obj)

ccflags-y := -fpic $(call cc-option,-mno-single-pic-base,) -fno-builtin -I$(obj)

asflags-y := -DZIMAGE



# Supply kernel BSS size to the decompressor via a linker symbol.

arch/arm/firmware/trusted_foundations.c

+9 −5
Original line number Diff line number Diff line
@@ -31,21 +31,25 @@ 


static unsigned long cpu_boot_addr;



static void __naked tf_generic_smc(u32 type, u32 arg1, u32 arg2)

static void tf_generic_smc(u32 type, u32 arg1, u32 arg2)

{

	register u32 r0 asm("r0") = type;

	register u32 r1 asm("r1") = arg1;

	register u32 r2 asm("r2") = arg2;



	asm volatile(

		".arch_extension	sec\n\t"

		"stmfd	sp!, {r4 - r11, lr}\n\t"

		"stmfd	sp!, {r4 - r11}\n\t"

		__asmeq("%0", "r0")

		__asmeq("%1", "r1")

		__asmeq("%2", "r2")

		"mov	r3, #0\n\t"

		"mov	r4, #0\n\t"

		"smc	#0\n\t"

		"ldmfd	sp!, {r4 - r11, pc}"

		"ldmfd	sp!, {r4 - r11}\n\t"

		:

		: "r" (type), "r" (arg1), "r" (arg2)

		: "memory");

		: "r" (r0), "r" (r1), "r" (r2)

		: "memory", "r3", "r12", "lr");

}



static int tf_set_cpu_boot_addr(int cpu, unsigned long boot_addr)

arch/x86/events/core.c

+0 −20
Original line number Diff line number Diff line
@@ -437,26 +437,6 @@ int x86_setup_perfctr(struct perf_event *event) 
	if (config == -1LL)

		return -EINVAL;



	/*

	 * Branch tracing:

	 */

	if (attr->config == PERF_COUNT_HW_BRANCH_INSTRUCTIONS &&

	    !attr->freq && hwc->sample_period == 1) {

		/* BTS is not supported by this architecture. */

		if (!x86_pmu.bts_active)

			return -EOPNOTSUPP;



		/* BTS is currently only allowed for user-mode. */

		if (!attr->exclude_kernel)

			return -EOPNOTSUPP;



		/* disallow bts if conflicting events are present */

		if (x86_add_exclusive(x86_lbr_exclusive_lbr))

			return -EBUSY;



		event->destroy = hw_perf_lbr_event_destroy;

	}



	hwc->config |= config;



	return 0;