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

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

Merge 4.19.32 into android-4.19



Changes in 4.19.32
	ALSA: hda - add Lenovo IdeaCentre B550 to the power_save_blacklist
	ALSA: firewire-motu: use 'version' field of unit directory to identify model
	mmc: pxamci: fix enum type confusion
	mmc: mxcmmc: "Revert mmc: mxcmmc: handle highmem pages"
	mmc: renesas_sdhi: limit block count to 16 bit for old revisions
	drm/vmwgfx: Don't double-free the mode stored in par->set_mode
	drm/vmwgfx: Return 0 when gmrid::get_node runs out of ID's
	iommu/amd: fix sg->dma_address for sg->offset bigger than PAGE_SIZE
	libceph: wait for latest osdmap in ceph_monc_blacklist_add()
	udf: Fix crash on IO error during truncate
	mips: loongson64: lemote-2f: Add IRQF_NO_SUSPEND to "cascade" irqaction.
	MIPS: Ensure ELF appended dtb is relocated
	MIPS: Fix kernel crash for R6 in jump label branch function
	powerpc/vdso64: Fix CLOCK_MONOTONIC inconsistencies across Y2038
	scsi: ibmvscsi: Protect ibmvscsi_head from concurrent modificaiton
	scsi: ibmvscsi: Fix empty event pool access during host removal
	futex: Ensure that futex address is aligned in handle_futex_death()
	cifs: allow guest mounts to work for smb3.11
	perf probe: Fix getting the kernel map
	objtool: Move objtool_file struct off the stack
	irqchip/gic-v3-its: Fix comparison logic in lpi_range_cmp
	SMB3: Fix SMB3.1.1 guest mounts to Samba
	ALSA: x86: Fix runtime PM for hdmi-lpe-audio
	ALSA: hda/ca0132 - make pci_iounmap() call conditional
	ALSA: ac97: Fix of-node refcount unbalance
	ext4: fix NULL pointer dereference while journal is aborted
	ext4: fix data corruption caused by unaligned direct AIO
	ext4: brelse all indirect buffer in ext4_ind_remove_space()
	media: v4l2-ctrls.c/uvc: zero v4l2_event
	Bluetooth: hci_uart: Check if socket buffer is ERR_PTR in h4_recv_buf()
	Bluetooth: Fix decrementing reference count twice in releasing socket
	Bluetooth: hci_ldisc: Initialize hci_dev before open()
	Bluetooth: hci_ldisc: Postpone HCI_UART_PROTO_READY bit set in hci_uart_set_proto()
	drm: Reorder set_property_atomic to avoid returning with an active ww_ctx
	RDMA/cma: Rollback source IP address if failing to acquire device
	f2fs: fix to avoid deadlock of atomic file operations
	netfilter: ebtables: remove BUGPRINT messages
	loop: access lo_backing_file only when the loop device is Lo_bound
	x86/unwind: Handle NULL pointer calls better in frame unwinder
	x86/unwind: Add hardcoded ORC entry for NULL
	locking/lockdep: Add debug_locks check in __lock_downgrade()
	ALSA: hda - Record the current power state before suspend/resume calls
	ALSA: hda - Enforces runtime_resume after S3 and S4 for each codec
	power: supply: charger-manager: Fix incorrect return value
	Linux 4.19.32

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents e705f6f1 3a2156c8
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
# SPDX-License-Identifier: GPL-2.0
VERSION = 4
PATCHLEVEL = 19
SUBLEVEL = 31
SUBLEVEL = 32
EXTRAVERSION =
NAME = "People's Front"

+4 −4
Original line number Diff line number Diff line
@@ -21,15 +21,15 @@
#endif

#ifdef CONFIG_CPU_MICROMIPS
#define NOP_INSN "nop32"
#define B_INSN "b32"
#else
#define NOP_INSN "nop"
#define B_INSN "b"
#endif

static __always_inline bool arch_static_branch(struct static_key *key, bool branch)
{
	asm_volatile_goto("1:\t" NOP_INSN "\n\t"
		"nop\n\t"
	asm_volatile_goto("1:\t" B_INSN " 2f\n\t"
		"2:\tnop\n\t"
		".pushsection __jump_table,  \"aw\"\n\t"
		WORD_INSN " 1b, %l[l_yes], %0\n\t"
		".popsection\n\t"
+7 −5
Original line number Diff line number Diff line
@@ -140,6 +140,13 @@ SECTIONS
	PERCPU_SECTION(1 << CONFIG_MIPS_L1_CACHE_SHIFT)
#endif

#ifdef CONFIG_MIPS_ELF_APPENDED_DTB
	.appended_dtb : AT(ADDR(.appended_dtb) - LOAD_OFFSET) {
		*(.appended_dtb)
		KEEP(*(.appended_dtb))
	}
#endif

#ifdef CONFIG_RELOCATABLE
	. = ALIGN(4);

@@ -164,11 +171,6 @@ SECTIONS
	__appended_dtb = .;
	/* leave space for appended DTB */
	. += 0x100000;
#elif defined(CONFIG_MIPS_ELF_APPENDED_DTB)
	.appended_dtb : AT(ADDR(.appended_dtb) - LOAD_OFFSET) {
		*(.appended_dtb)
		KEEP(*(.appended_dtb))
	}
#endif
	/*
	 * Align to 64K in attempt to eliminate holes before the
+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ static struct irqaction ip6_irqaction = {
static struct irqaction cascade_irqaction = {
	.handler = no_action,
	.name = "cascade",
	.flags = IRQF_NO_THREAD,
	.flags = IRQF_NO_THREAD | IRQF_NO_SUSPEND,
};

void __init mach_init_irq(void)
+4 −4
Original line number Diff line number Diff line
@@ -82,10 +82,10 @@ struct vdso_data {
	__u32 icache_block_size;		/* L1 i-cache block size     */
	__u32 dcache_log_block_size;		/* L1 d-cache log block size */
	__u32 icache_log_block_size;		/* L1 i-cache log block size */
	__s32 wtom_clock_sec;			/* Wall to monotonic clock */
	__s32 wtom_clock_nsec;
	struct timespec stamp_xtime;	/* xtime as at tb_orig_stamp */
	__u32 stamp_sec_fraction;		/* fractional seconds of stamp_xtime */
	__s32 wtom_clock_nsec;			/* Wall to monotonic clock nsec */
	__s64 wtom_clock_sec;			/* Wall to monotonic clock sec */
	struct timespec stamp_xtime;		/* xtime as at tb_orig_stamp */
   	__u32 syscall_map_64[SYSCALL_MAP_SIZE]; /* map of syscalls  */
   	__u32 syscall_map_32[SYSCALL_MAP_SIZE]; /* map of syscalls */
};
Loading