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

Commit daf8f716 authored by Matt Wagantall's avatar Matt Wagantall
Browse files

Merge tag 'v3.18.7' into msm-3.18 



This is the 3.18.7 stable release

Resolve a couple trivial context conflicts with local changes
as part of the merge resolution. These relate to upstream change
1fb32679 ("arm64: Fix up /proc/cpuinfo"), which removes the
printing of machine_name in cpuinfo, and conflicts with local
changes to how machine_name was printed.

Conflicts:
	arch/arm64/kernel/setup.c

Change-Id: Ia3d547a9ae8a1e22c2fee7cbeaf075f23e46a629
Signed-off-by: default avatarMatt Wagantall <mattw@codeaurora.org>
parents 291db2dc a17f9bf1

Makefile

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

PATCHLEVEL = 18

SUBLEVEL = 6

SUBLEVEL = 7

EXTRAVERSION =

NAME = Shuffling Zombie Juror

arch/arm/boot/dts/exynos4.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -368,7 +368,7 @@ 
	};



	i2s1: i2s@13960000 {

		compatible = "samsung,s5pv210-i2s";

		compatible = "samsung,s3c6410-i2s";

		reg = <0x13960000 0x100>;

		clocks = <&clock CLK_I2S1>;

		clock-names = "iis";
@@ -378,7 +378,7 @@ 
	};



	i2s2: i2s@13970000 {

		compatible = "samsung,s5pv210-i2s";

		compatible = "samsung,s3c6410-i2s";

		reg = <0x13970000 0x100>;

		clocks = <&clock CLK_I2S2>;

		clock-names = "iis";

arch/arm/mm/context.c

+11 −15
Original line number Diff line number Diff line
@@ -146,9 +146,6 @@ static void flush_context(unsigned int cpu) 
	/* Update the list of reserved ASIDs and the ASID bitmap. */

	bitmap_clear(asid_map, 0, NUM_USER_ASIDS);

	for_each_possible_cpu(i) {

		if (i == cpu) {

			asid = 0;

		} else {

		asid = atomic64_xchg(&per_cpu(active_asids, i), 0);

		/*

		 * If this CPU has already been through a
@@ -160,7 +157,6 @@ static void flush_context(unsigned int cpu) 
		if (asid == 0)

			asid = per_cpu(reserved_asids, i);

		__set_bit(asid & ~ASID_MASK, asid_map);

		}

		per_cpu(reserved_asids, i) = asid;

	}

arch/arm64/kernel/setup.c

+1 −8
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ unsigned int cold_boot; 
EXPORT_SYMBOL(cold_boot);



static const char *cpu_name;

static const char *machine_name;

phys_addr_t __fdt_pointer __initdata;



/*
@@ -324,9 +323,6 @@ static void __init setup_machine_fdt(phys_addr_t dt_phys) 
	}



	dump_stack_set_arch_desc("%s (DT)", of_flat_dt_get_machine_name());

	machine_name = of_flat_dt_get_machine_name();

	if (machine_name)

		pr_info("Machine: %s\n", machine_name);

}



/*
@@ -509,6 +505,7 @@ static int c_show(struct seq_file *m, void *v) 
	for_each_present_cpu(i) {

		struct cpuinfo_arm64 *cpuinfo = &per_cpu(cpu_data, i);

		u32 midr = cpuinfo->reg_midr;



		/*

		 * glibc reads /proc/cpuinfo to determine the number of

		 * online processors, looking for lines beginning with
@@ -549,10 +546,6 @@ static int c_show(struct seq_file *m, void *v) 
		seq_printf(m, "CPU part\t: 0x%03x\n", MIDR_PARTNUM(midr));

		seq_printf(m, "CPU revision\t: %d\n\n", MIDR_REVISION(midr));

	}

	if (!arch_read_hardware_id)

		seq_printf(m, "Hardware\t: %s\n", machine_name);

	else

		seq_printf(m, "Hardware\t: %s\n", arch_read_hardware_id());



	return 0;

}

arch/mips/cavium-octeon/smp.c

+0 −2
Original line number Diff line number Diff line
@@ -240,9 +240,7 @@ static int octeon_cpu_disable(void) 


	set_cpu_online(cpu, false);

	cpu_clear(cpu, cpu_callin_map);

	local_irq_disable();

	octeon_fixup_irqs();

	local_irq_enable();



	flush_cache_all();

	local_flush_tlb_all();