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

Unverified Commit 8a2325ba authored by hmtheboy154's avatar hmtheboy154
Browse files

Merge commit '7883946a' into lineage-22.2

parents f96e8a98 7883946a

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 300

SUBLEVEL = 306

EXTRAVERSION =

NAME = "People's Front"

arch/arc/kernel/signal.c

+3 −3
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ struct rt_sigframe { 
	unsigned int sigret_magic;

};



static int save_arcv2_regs(struct sigcontext *mctx, struct pt_regs *regs)

static int save_arcv2_regs(struct sigcontext __user *mctx, struct pt_regs *regs)

{

	int err = 0;

#ifndef CONFIG_ISA_ARCOMPACT
@@ -77,12 +77,12 @@ static int save_arcv2_regs(struct sigcontext *mctx, struct pt_regs *regs) 
#else

	v2abi.r58 = v2abi.r59 = 0;

#endif

	err = __copy_to_user(&mctx->v2abi, &v2abi, sizeof(v2abi));

	err = __copy_to_user(&mctx->v2abi, (void const *)&v2abi, sizeof(v2abi));

#endif

	return err;

}



static int restore_arcv2_regs(struct sigcontext *mctx, struct pt_regs *regs)

static int restore_arcv2_regs(struct sigcontext __user *mctx, struct pt_regs *regs)

{

	int err = 0;

#ifndef CONFIG_ISA_ARCOMPACT

arch/arm/boot/dts/imx6qdl.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -565,7 +565,7 @@ 
				status = "disabled";

			};



			gpt: gpt@2098000 {

			gpt: timer@2098000 {

				compatible = "fsl,imx6q-gpt", "fsl,imx31-gpt";

				reg = <0x02098000 0x4000>;

				interrupts = <0 55 IRQ_TYPE_LEVEL_HIGH>;

arch/arm/boot/dts/imx6sl.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -374,7 +374,7 @@ 
				clock-names = "ipg", "per";

			};



			gpt: gpt@2098000 {

			gpt: timer@2098000 {

				compatible = "fsl,imx6sl-gpt";

				reg = <0x02098000 0x4000>;

				interrupts = <0 55 IRQ_TYPE_LEVEL_HIGH>;

arch/arm/boot/dts/imx6sx.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -468,7 +468,7 @@ 
				status = "disabled";

			};



			gpt: gpt@2098000 {

			gpt: timer@2098000 {

				compatible = "fsl,imx6sx-gpt", "fsl,imx6dl-gpt";

				reg = <0x02098000 0x4000>;

				interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;