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

Commit f90ae1b6 authored by Alex Shi's avatar Alex Shi
Browse files

Merge remote-tracking branch 'lts/linux-3.18.y' into linux-linaro-lsk-v3.18

parents 346a8beb 60917545

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 3

PATCHLEVEL = 18

SUBLEVEL = 24

SUBLEVEL = 25

EXTRAVERSION =

NAME = Diseased Newt

arch/arm/plat-orion/common.c

+1 −1
Original line number Diff line number Diff line
@@ -499,7 +499,7 @@ void __init orion_ge00_switch_init(struct dsa_platform_data *d, int irq) 


	d->netdev = &orion_ge00.dev;

	for (i = 0; i < d->nr_chips; i++)

		d->chip[i].host_dev = &orion_ge00_shared.dev;

		d->chip[i].host_dev = &orion_ge_mvmdio.dev;

	orion_switch_device.dev.platform_data = d;



	platform_device_register(&orion_switch_device);

arch/arm64/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ endif 
CHECKFLAGS	+= -D__aarch64__



ifeq ($(CONFIG_ARM64_ERRATUM_843419), y)

CFLAGS_MODULE	+= -mcmodel=large

KBUILD_CFLAGS_MODULE	+= -mcmodel=large

endif



# Default value

arch/arm64/kernel/stacktrace.c

+1 −5
Original line number Diff line number Diff line
@@ -48,11 +48,7 @@ int notrace unwind_frame(struct stackframe *frame) 


	frame->sp = fp + 0x10;

	frame->fp = *(unsigned long *)(fp);

	/*

	 * -4 here because we care about the PC at time of bl,

	 * not where the return will go.

	 */

	frame->pc = *(unsigned long *)(fp + 8) - 4;

	frame->pc = *(unsigned long *)(fp + 8);



	return 0;

}

arch/powerpc/kernel/rtas.c

+3 −0
Original line number Diff line number Diff line
@@ -1045,6 +1045,9 @@ asmlinkage int ppc_rtas(struct rtas_args __user *uargs) 
	if (!capable(CAP_SYS_ADMIN))

		return -EPERM;



	if (!rtas.entry)

		return -EINVAL;



	if (copy_from_user(&args, uargs, 3 * sizeof(u32)) != 0)

		return -EFAULT;