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

Commit 9b987ea9 authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge branch 'linux-3.18.y' of... 

Merge branch 'linux-3.18.y' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-linaro-lsk-v3.18
parents 1ba83d9e 43f497a2

Makefile

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

PATCHLEVEL = 18

SUBLEVEL = 11

SUBLEVEL = 12

EXTRAVERSION =

NAME = Diseased Newt

arch/arm64/include/asm/mmu_context.h

+9 −0
Original line number Diff line number Diff line
@@ -151,6 +151,15 @@ switch_mm(struct mm_struct *prev, struct mm_struct *next, 
{

	unsigned int cpu = smp_processor_id();



	/*

	 * init_mm.pgd does not contain any user mappings and it is always

	 * active for kernel addresses in TTBR1. Just set the reserved TTBR0.

	 */

	if (next == &init_mm) {

		cpu_set_reserved_ttbr0();

		return;

	}



	if (!cpumask_test_and_set_cpu(cpu, mm_cpumask(next)) || prev != next)

		check_and_switch_context(next, tsk);

}

arch/powerpc/boot/dts/fsl/pq3-etsec2-0.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ ethernet@b0000 { 
	fsl,num_tx_queues = <0x8>;

	fsl,magic-packet;

	local-mac-address = [ 00 00 00 00 00 00 ];

	ranges;



	queue-group@b0000 {

		#address-cells = <1>;

arch/powerpc/boot/dts/fsl/pq3-etsec2-1.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ ethernet@b1000 { 
	fsl,num_tx_queues = <0x8>;

	fsl,magic-packet;

	local-mac-address = [ 00 00 00 00 00 00 ];

	ranges;



	queue-group@b1000 {

		#address-cells = <1>;

arch/powerpc/boot/dts/fsl/pq3-etsec2-2.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ ethernet@b2000 { 
	fsl,num_tx_queues = <0x8>;

	fsl,magic-packet;

	local-mac-address = [ 00 00 00 00 00 00 ];

	ranges;



	queue-group@b2000 {

		#address-cells = <1>;