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

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

Merge 4.19.197 into android-4.19-stable 



Changes in 4.19.197
	mm: add VM_WARN_ON_ONCE_PAGE() macro
	mm/rmap: remove unneeded semicolon in page_not_mapped()
	mm/rmap: use page_not_mapped in try_to_unmap()
	mm/thp: fix __split_huge_pmd_locked() on shmem migration entry
	mm/thp: make is_huge_zero_pmd() safe and quicker
	mm/thp: try_to_unmap() use TTU_SYNC for safe splitting
	mm/thp: fix vma_address() if virtual address below file offset
	mm/thp: fix page_address_in_vma() on file THP tails
	mm/thp: unmap_mapping_page() to fix THP truncate_cleanup_page()
	mm: thp: replace DEBUG_VM BUG with VM_WARN when unmap fails for split
	mm: page_vma_mapped_walk(): use page for pvmw->page
	mm: page_vma_mapped_walk(): settle PageHuge on entry
	mm: page_vma_mapped_walk(): use pmde for *pvmw->pmd
	mm: page_vma_mapped_walk(): prettify PVMW_MIGRATION block
	mm: page_vma_mapped_walk(): crossing page table boundary
	mm: page_vma_mapped_walk(): add a level of indentation
	mm: page_vma_mapped_walk(): use goto instead of while (1)
	mm: page_vma_mapped_walk(): get vma_address_end() earlier
	mm/thp: fix page_vma_mapped_walk() if THP mapped by ptes
	mm/thp: another PVMW_SYNC fix in page_vma_mapped_walk()
	mm, futex: fix shared futex pgoff on shmem huge page
	scsi: sr: Return appropriate error code when disk is ejected
	drm/nouveau: fix dma_address check for CPU/GPU sync
	ext4: eliminate bogus error in ext4_data_block_valid_rcu()
	KVM: SVM: Periodically schedule when unregistering regions on destroy
	ARM: dts: imx6qdl-sabresd: Remove incorrect power supply assignment
	kthread_worker: split code for canceling the delayed work timer
	kthread: prevent deadlock when kthread_mod_delayed_work() races with kthread_cancel_delayed_work_sync()
	xen/events: reset active flag for lateeoi events later
	KVM: SVM: Call SEV Guest Decommission if ASID binding fails
	ARM: OMAP: replace setup_irq() by request_irq()
	clocksource/drivers/timer-ti-dm: Add clockevent and clocksource support
	clocksource/drivers/timer-ti-dm: Prepare to handle dra7 timer wrap issue
	clocksource/drivers/timer-ti-dm: Handle dra7 timer wrap errata i940
	Linux 4.19.197

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I733cdb08e37808851f4ff54a2e333f3c7d4e9257
parents 2215bae0 fcfbdfe9

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 196

SUBLEVEL = 197

EXTRAVERSION =

NAME = "People's Front"

arch/arm/boot/dts/dra7.dtsi

+11 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ 


	timer {

		compatible = "arm,armv7-timer";

		status = "disabled";	/* See ARM architected timer wrap erratum i940 */

		interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,

			     <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,

			     <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
@@ -910,6 +911,8 @@ 
			reg = <0x48032000 0x80>;

			interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;

			ti,hwmods = "timer2";

			clock-names = "fck";

			clocks = <&l4per_clkctrl DRA7_TIMER2_CLKCTRL 24>;

		};



		timer3: timer@48034000 {
@@ -917,6 +920,10 @@ 
			reg = <0x48034000 0x80>;

			interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;

			ti,hwmods = "timer3";

			clock-names = "fck";

			clocks = <&l4per_clkctrl DRA7_TIMER3_CLKCTRL 24>;

			assigned-clocks = <&l4per_clkctrl DRA7_TIMER3_CLKCTRL 24>;

			assigned-clock-parents = <&timer_sys_clk_div>;

		};



		timer4: timer@48036000 {
@@ -924,6 +931,10 @@ 
			reg = <0x48036000 0x80>;

			interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;

			ti,hwmods = "timer4";

			clock-names = "fck";

			clocks = <&l4per_clkctrl DRA7_TIMER4_CLKCTRL 24>;

			assigned-clocks = <&l4per_clkctrl DRA7_TIMER4_CLKCTRL 24>;

			assigned-clock-parents = <&timer_sys_clk_div>;

		};



		timer5: timer@48820000 {

arch/arm/boot/dts/imx6qdl-sabresd.dtsi

+0 −4
Original line number Diff line number Diff line
@@ -675,10 +675,6 @@ 
	vin-supply = <&vgen5_reg>;

};



&reg_vdd3p0 {

	vin-supply = <&sw2_reg>;

};



&reg_vdd2p5 {

	vin-supply = <&vgen5_reg>;

};

arch/arm/mach-omap1/pm.c

+6 −7
Original line number Diff line number Diff line
@@ -610,11 +610,6 @@ static irqreturn_t omap_wakeup_interrupt(int irq, void *dev) 
	return IRQ_HANDLED;

}



static struct irqaction omap_wakeup_irq = {

	.name		= "peripheral wakeup",

	.handler	= omap_wakeup_interrupt

};







static const struct platform_suspend_ops omap_pm_ops = {
@@ -627,6 +622,7 @@ static const struct platform_suspend_ops omap_pm_ops = { 
static int __init omap_pm_init(void)

{

	int error = 0;

	int irq;



	if (!cpu_class_is_omap1())

		return -ENODEV;
@@ -670,9 +666,12 @@ static int __init omap_pm_init(void) 
	arm_pm_idle = omap1_pm_idle;



	if (cpu_is_omap7xx())

		setup_irq(INT_7XX_WAKE_UP_REQ, &omap_wakeup_irq);

		irq = INT_7XX_WAKE_UP_REQ;

	else if (cpu_is_omap16xx())

		setup_irq(INT_1610_WAKE_UP_REQ, &omap_wakeup_irq);

		irq = INT_1610_WAKE_UP_REQ;

	if (request_irq(irq, omap_wakeup_interrupt, 0, "peripheral wakeup",

			NULL))

		pr_err("Failed to request irq %d (peripheral wakeup)\n", irq);



	/* Program new power ramp-up time

	 * (0 for most boards since we don't lower voltage when in deep sleep)

arch/arm/mach-omap1/time.c

+3 −7
Original line number Diff line number Diff line
@@ -155,15 +155,11 @@ static irqreturn_t omap_mpu_timer1_interrupt(int irq, void *dev_id) 
	return IRQ_HANDLED;

}



static struct irqaction omap_mpu_timer1_irq = {

	.name		= "mpu_timer1",

	.flags		= IRQF_TIMER | IRQF_IRQPOLL,

	.handler	= omap_mpu_timer1_interrupt,

};



static __init void omap_init_mpu_timer(unsigned long rate)

{

	setup_irq(INT_TIMER1, &omap_mpu_timer1_irq);

	if (request_irq(INT_TIMER1, omap_mpu_timer1_interrupt,

			IRQF_TIMER | IRQF_IRQPOLL, "mpu_timer1", NULL))

		pr_err("Failed to request irq %d (mpu_timer1)\n", INT_TIMER1);

	omap_mpu_timer_start(0, (rate / HZ) - 1, 1);



	clockevent_mpu_timer1.cpumask = cpumask_of(0);