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

Commit 1ac603b5 authored by Treehugger Robot's avatar Treehugger Robot
Browse files

Merge "Merge 4.19.273 into android-4.19-stable" into android-4.19-stable

parents 7ce40083 bd71171c

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 272

SUBLEVEL = 273

EXTRAVERSION =

NAME = "People's Front"

arch/arm64/boot/dts/amlogic/meson-axg.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ 
			sd_emmc_b: sd@5000 {

				compatible = "amlogic,meson-axg-mmc";

				reg = <0x0 0x5000 0x0 0x800>;

				interrupts = <GIC_SPI 217 IRQ_TYPE_EDGE_RISING>;

				interrupts = <GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH>;

				status = "disabled";

				clocks = <&clkc CLKID_SD_EMMC_B>,

					<&clkc CLKID_SD_EMMC_B_CLK0>,
@@ -179,7 +179,7 @@ 
			sd_emmc_c: mmc@7000 {

				compatible = "amlogic,meson-axg-mmc";

				reg = <0x0 0x7000 0x0 0x800>;

				interrupts = <GIC_SPI 218 IRQ_TYPE_EDGE_RISING>;

				interrupts = <GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH>;

				status = "disabled";

				clocks = <&clkc CLKID_SD_EMMC_C>,

					<&clkc CLKID_SD_EMMC_C_CLK0>,

arch/arm64/boot/dts/amlogic/meson-gx.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -470,21 +470,21 @@ 
			sd_emmc_a: mmc@70000 {

				compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc";

				reg = <0x0 0x70000 0x0 0x800>;

				interrupts = <GIC_SPI 216 IRQ_TYPE_EDGE_RISING>;

				interrupts = <GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH>;

				status = "disabled";

			};



			sd_emmc_b: mmc@72000 {

				compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc";

				reg = <0x0 0x72000 0x0 0x800>;

				interrupts = <GIC_SPI 217 IRQ_TYPE_EDGE_RISING>;

				interrupts = <GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH>;

				status = "disabled";

			};



			sd_emmc_c: mmc@74000 {

				compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc";

				reg = <0x0 0x74000 0x0 0x800>;

				interrupts = <GIC_SPI 218 IRQ_TYPE_EDGE_RISING>;

				interrupts = <GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH>;

				status = "disabled";

			};

		};

arch/parisc/kernel/firmware.c

+3 −2
Original line number Diff line number Diff line
@@ -1197,7 +1197,7 @@ static char __attribute__((aligned(64))) iodc_dbuf[4096]; 
 */

int pdc_iodc_print(const unsigned char *str, unsigned count)

{

	unsigned int i;

	unsigned int i, found = 0;

	unsigned long flags;



	for (i = 0; i < count;) {
@@ -1206,6 +1206,7 @@ int pdc_iodc_print(const unsigned char *str, unsigned count) 
			iodc_dbuf[i+0] = '\r';

			iodc_dbuf[i+1] = '\n';

			i += 2;

			found = 1;

			goto print;

		default:

			iodc_dbuf[i] = str[i];
@@ -1222,7 +1223,7 @@ int pdc_iodc_print(const unsigned char *str, unsigned count) 
                    __pa(iodc_retbuf), 0, __pa(iodc_dbuf), i, 0);

        spin_unlock_irqrestore(&pdc_lock, flags);



	return i;

	return i - found;

}



#if !defined(BOOTLOADER)

arch/parisc/kernel/ptrace.c

+13 −2
Original line number Diff line number Diff line
@@ -128,6 +128,12 @@ long arch_ptrace(struct task_struct *child, long request, 
	unsigned long tmp;

	long ret = -EIO;



	unsigned long user_regs_struct_size = sizeof(struct user_regs_struct);

#ifdef CONFIG_64BIT

	if (is_compat_task())

		user_regs_struct_size /= 2;

#endif



	switch (request) {



	/* Read the word at location addr in the USER area.  For ptraced
@@ -183,14 +189,14 @@ long arch_ptrace(struct task_struct *child, long request, 
		return copy_regset_to_user(child,

					   task_user_regset_view(current),

					   REGSET_GENERAL,

					   0, sizeof(struct user_regs_struct),

					   0, user_regs_struct_size,

					   datap);



	case PTRACE_SETREGS:	/* Set all gp regs in the child. */

		return copy_regset_from_user(child,

					     task_user_regset_view(current),

					     REGSET_GENERAL,

					     0, sizeof(struct user_regs_struct),

					     0, user_regs_struct_size,

					     datap);



	case PTRACE_GETFPREGS:	/* Get the child FPU state. */
@@ -304,6 +310,11 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request, 
			}

		}

		break;

	case PTRACE_GETREGS:

	case PTRACE_SETREGS:

	case PTRACE_GETFPREGS:

	case PTRACE_SETFPREGS:

		return arch_ptrace(child, request, addr, data);



	default:

		ret = compat_ptrace_request(child, request, addr, data);