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

Commit 98576a3b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge android-4.9.194(f360bd46) into msm-4.9"

parents 77a3833f 4be6354a

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 193

SUBLEVEL = 194

EXTRAVERSION =

NAME = Roaring Lionus

arch/arc/kernel/traps.c

+1 −0
Original line number Diff line number Diff line
@@ -163,3 +163,4 @@ void abort(void) 
{

	__asm__ __volatile__("trap_s  5\n");

}

EXPORT_SYMBOL(abort);

arch/arm/mach-omap2/omap4-common.c

+3 −0
Original line number Diff line number Diff line
@@ -131,6 +131,9 @@ static int __init omap4_sram_init(void) 
	struct device_node *np;

	struct gen_pool *sram_pool;



	if (!soc_is_omap44xx() && !soc_is_omap54xx())

		return 0;



	np = of_find_compatible_node(NULL, NULL, "ti,omap4-mpu");

	if (!np)

		pr_warn("%s:Unable to allocate sram needed to handle errata I688\n",

arch/arm/mach-omap2/omap_hwmod_7xx_data.c

+2 −1
Original line number Diff line number Diff line
@@ -387,7 +387,8 @@ static struct omap_hwmod dra7xx_dcan2_hwmod = { 
static struct omap_hwmod_class_sysconfig dra7xx_epwmss_sysc = {

	.rev_offs	= 0x0,

	.sysc_offs	= 0x4,

	.sysc_flags	= SYSC_HAS_SIDLEMODE | SYSC_HAS_SOFTRESET,

	.sysc_flags	= SYSC_HAS_SIDLEMODE | SYSC_HAS_SOFTRESET |

			  SYSC_HAS_RESET_STATUS,

	.idlemodes	= (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART),

	.sysc_fields	= &omap_hwmod_sysc_type2,

};

arch/arm/mm/init.c

+2 −1
Original line number Diff line number Diff line
@@ -805,6 +805,7 @@ static void update_sections_early(struct section_perm perms[], int n) 
		if (t->flags & PF_KTHREAD)

			continue;

		for_each_thread(t, s)

			if (s->mm)

				set_section_perms(perms, n, true, s->mm);

	}

	read_unlock(&tasklist_lock);