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

Commit ccd9df2b authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge android-4.19-q.72 (64f28a85) into msm-4.19"

parents 84bd424f dd955093

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 70

SUBLEVEL = 72

EXTRAVERSION =

NAME = "People's Front"

arch/x86/boot/compressed/pgtable_64.c

+10 −3
Original line number Diff line number Diff line
@@ -73,6 +73,8 @@ static unsigned long find_trampoline_placement(void) 


	/* Find the first usable memory region under bios_start. */

	for (i = boot_params->e820_entries - 1; i >= 0; i--) {

		unsigned long new = bios_start;



		entry = &boot_params->e820_table[i];



		/* Skip all entries above bios_start. */
@@ -85,15 +87,20 @@ static unsigned long find_trampoline_placement(void) 


		/* Adjust bios_start to the end of the entry if needed. */

		if (bios_start > entry->addr + entry->size)

			bios_start = entry->addr + entry->size;

			new = entry->addr + entry->size;



		/* Keep bios_start page-aligned. */

		bios_start = round_down(bios_start, PAGE_SIZE);

		new = round_down(new, PAGE_SIZE);



		/* Skip the entry if it's too small. */

		if (bios_start - TRAMPOLINE_32BIT_SIZE < entry->addr)

		if (new - TRAMPOLINE_32BIT_SIZE < entry->addr)

			continue;



		/* Protect against underflow. */

		if (new - TRAMPOLINE_32BIT_SIZE > bios_start)

			break;



		bios_start = new;

		break;

	}

arch/x86/include/asm/bootparam_utils.h

+1 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ static void sanitize_boot_params(struct boot_params *boot_params) 
			BOOT_PARAM_PRESERVE(eddbuf_entries),

			BOOT_PARAM_PRESERVE(edd_mbr_sig_buf_entries),

			BOOT_PARAM_PRESERVE(edd_mbr_sig_buffer),

			BOOT_PARAM_PRESERVE(secure_boot),

			BOOT_PARAM_PRESERVE(hdr),

			BOOT_PARAM_PRESERVE(e820_table),

			BOOT_PARAM_PRESERVE(eddbuf),

arch/x86/kernel/apic/apic.c

+0 −4
Original line number Diff line number Diff line
@@ -1140,10 +1140,6 @@ void clear_local_APIC(void) 
	apic_write(APIC_LVT0, v | APIC_LVT_MASKED);

	v = apic_read(APIC_LVT1);

	apic_write(APIC_LVT1, v | APIC_LVT_MASKED);

	if (!x2apic_enabled()) {

		v = apic_read(APIC_LDR) & ~APIC_LDR_MASK;

		apic_write(APIC_LDR, v);

	}

	if (maxlvt >= 4) {

		v = apic_read(APIC_LVTPC);

		apic_write(APIC_LVTPC, v | APIC_LVT_MASKED);

drivers/bluetooth/btqca.c

+3 −0
Original line number Diff line number Diff line
@@ -363,6 +363,9 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate, 
		return err;

	}



	/* Give the controller some time to get ready to receive the NVM */

	msleep(10);



	/* Download NVM configuration */

	config.type = TLV_TYPE_NVM;

	if (soc_type == QCA_WCN3990)