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

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

Merge 4.19.186 into android-4.19-stable 



Changes in 4.19.186
	ARM: dts: am33xx: add aliases for mmc interfaces
	bus: ti-sysc: Fix warning on unbind if reset is not deasserted
	platform/x86: intel-hid: Support Lenovo ThinkPad X1 Tablet Gen 2
	net: pxa168_eth: Fix a potential data race in pxa168_eth_remove
	mISDN: fix crash in fritzpci
	mac80211: choose first enabled channel for monitor
	drm/msm: Ratelimit invalid-fence message
	platform/x86: thinkpad_acpi: Allow the FnLock LED to change state
	x86/build: Turn off -fcf-protection for realmode targets
	scsi: target: pscsi: Clean up after failure in pscsi_map_sg()
	ia64: mca: allocate early mca with GFP_ATOMIC
	ia64: fix format strings for err_inject
	cifs: revalidate mapping when we open files for SMB1 POSIX
	cifs: Silently ignore unknown oplock break handle
	bpf, x86: Validate computation of branch displacements for x86-64
	bpf, x86: Validate computation of branch displacements for x86-32
	init/Kconfig: make COMPILE_TEST depend on !S390
	init/Kconfig: make COMPILE_TEST depend on HAS_IOMEM
	Linux 4.19.186

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Ifac76043f9e442570932332337122def0fd8d6eb
parents 8c62f425 830a059c

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 185

SUBLEVEL = 186

EXTRAVERSION =

NAME = "People's Front"

arch/arm/boot/dts/am33xx.dtsi

+3 −0
Original line number Diff line number Diff line
@@ -39,6 +39,9 @@ 
		ethernet1 = &cpsw_emac1;

		spi0 = &spi0;

		spi1 = &spi1;

		mmc0 = &mmc1;

		mmc1 = &mmc2;

		mmc2 = &mmc3;

	};



	cpus {

arch/ia64/kernel/err_inject.c

+11 −11
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ show_##name(struct device *dev, struct device_attribute *attr, \ 
		char *buf)						\

{									\

	u32 cpu=dev->id;						\

	return sprintf(buf, "%lx\n", name[cpu]);			\

	return sprintf(buf, "%llx\n", name[cpu]);			\

}



#define store(name)							\
@@ -86,9 +86,9 @@ store_call_start(struct device *dev, struct device_attribute *attr, 


#ifdef ERR_INJ_DEBUG

	printk(KERN_DEBUG "pal_mc_err_inject for cpu%d:\n", cpu);

	printk(KERN_DEBUG "err_type_info=%lx,\n", err_type_info[cpu]);

	printk(KERN_DEBUG "err_struct_info=%lx,\n", err_struct_info[cpu]);

	printk(KERN_DEBUG "err_data_buffer=%lx, %lx, %lx.\n",

	printk(KERN_DEBUG "err_type_info=%llx,\n", err_type_info[cpu]);

	printk(KERN_DEBUG "err_struct_info=%llx,\n", err_struct_info[cpu]);

	printk(KERN_DEBUG "err_data_buffer=%llx, %llx, %llx.\n",

			  err_data_buffer[cpu].data1,

			  err_data_buffer[cpu].data2,

			  err_data_buffer[cpu].data3);
@@ -117,8 +117,8 @@ store_call_start(struct device *dev, struct device_attribute *attr, 


#ifdef ERR_INJ_DEBUG

	printk(KERN_DEBUG "Returns: status=%d,\n", (int)status[cpu]);

	printk(KERN_DEBUG "capabilities=%lx,\n", capabilities[cpu]);

	printk(KERN_DEBUG "resources=%lx\n", resources[cpu]);

	printk(KERN_DEBUG "capabilities=%llx,\n", capabilities[cpu]);

	printk(KERN_DEBUG "resources=%llx\n", resources[cpu]);

#endif

	return size;

}
@@ -131,7 +131,7 @@ show_virtual_to_phys(struct device *dev, struct device_attribute *attr, 
			char *buf)

{

	unsigned int cpu=dev->id;

	return sprintf(buf, "%lx\n", phys_addr[cpu]);

	return sprintf(buf, "%llx\n", phys_addr[cpu]);

}



static ssize_t
@@ -145,7 +145,7 @@ store_virtual_to_phys(struct device *dev, struct device_attribute *attr, 
	ret = get_user_pages_fast(virt_addr, 1, FOLL_WRITE, NULL);

	if (ret<=0) {

#ifdef ERR_INJ_DEBUG

		printk("Virtual address %lx is not existing.\n",virt_addr);

		printk("Virtual address %llx is not existing.\n", virt_addr);

#endif

		return -EINVAL;

	}
@@ -163,7 +163,7 @@ show_err_data_buffer(struct device *dev, 
{

	unsigned int cpu=dev->id;



	return sprintf(buf, "%lx, %lx, %lx\n",

	return sprintf(buf, "%llx, %llx, %llx\n",

			err_data_buffer[cpu].data1,

			err_data_buffer[cpu].data2,

			err_data_buffer[cpu].data3);
@@ -178,13 +178,13 @@ store_err_data_buffer(struct device *dev, 
	int ret;



#ifdef ERR_INJ_DEBUG

	printk("write err_data_buffer=[%lx,%lx,%lx] on cpu%d\n",

	printk("write err_data_buffer=[%llx,%llx,%llx] on cpu%d\n",

		 err_data_buffer[cpu].data1,

		 err_data_buffer[cpu].data2,

		 err_data_buffer[cpu].data3,

		 cpu);

#endif

	ret=sscanf(buf, "%lx, %lx, %lx",

	ret = sscanf(buf, "%llx, %llx, %llx",

			&err_data_buffer[cpu].data1,

			&err_data_buffer[cpu].data2,

			&err_data_buffer[cpu].data3);

arch/ia64/kernel/mca.c

+1 −1
Original line number Diff line number Diff line
@@ -1860,7 +1860,7 @@ ia64_mca_cpu_init(void *cpu_data) 
			data = mca_bootmem();

			first_time = 0;

		} else

			data = (void *)__get_free_pages(GFP_KERNEL,

			data = (void *)__get_free_pages(GFP_ATOMIC,

							get_order(sz));

		if (!data)

			panic("Could not allocate MCA memory for cpu %d\n",

arch/x86/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ M16_CFLAGS := $(call cc-option, -m16, $(CODE16GCC_CFLAGS)) 
REALMODE_CFLAGS	:= $(M16_CFLAGS) -g -Os -DDISABLE_BRANCH_PROFILING \

		   -Wall -Wstrict-prototypes -march=i386 -mregparm=3 \

		   -fno-strict-aliasing -fomit-frame-pointer -fno-pic \

		   -mno-mmx -mno-sse

		   -mno-mmx -mno-sse $(call cc-option,-fcf-protection=none)



REALMODE_CFLAGS += $(call __cc-option, $(CC), $(REALMODE_CFLAGS), -ffreestanding)

REALMODE_CFLAGS += $(call __cc-option, $(CC), $(REALMODE_CFLAGS), -fno-stack-protector)