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

Commit 6784ffb3 authored by Alex Shi's avatar Alex Shi
Browse files

Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-android

parents 2ec744e1 17c92e2a

Makefile

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

PATCHLEVEL = 18

SUBLEVEL = 37

SUBLEVEL = 38

EXTRAVERSION =

NAME = Shuffling Zombie Juror

arch/mips/include/asm/pgtable.h

+2 −1
Original line number Diff line number Diff line
@@ -596,7 +596,8 @@ static inline struct page *pmd_page(pmd_t pmd) 


static inline pmd_t pmd_modify(pmd_t pmd, pgprot_t newprot)

{

	pmd_val(pmd) = (pmd_val(pmd) & _PAGE_CHG_MASK) | pgprot_val(newprot);

	pmd_val(pmd) = (pmd_val(pmd) & (_PAGE_CHG_MASK | _PAGE_HUGE)) |

		       (pgprot_val(newprot) & ~_PAGE_CHG_MASK);

	return pmd;

}

arch/powerpc/kernel/prom.c

+1 −2
Original line number Diff line number Diff line
@@ -166,8 +166,7 @@ static struct ibm_pa_feature { 
	 * we don't want to turn on TM here, so we use the *_COMP versions

	 * which are 0 if the kernel doesn't support TM.

	 */

	{CPU_FTR_TM_COMP, 0, 0,

	 PPC_FEATURE2_HTM_COMP|PPC_FEATURE2_HTM_NOSC_COMP, 22, 0, 0},

	{CPU_FTR_TM_COMP, 0, 0, PPC_FEATURE2_HTM_COMP, 22, 0, 0},

};



static void __init scan_features(unsigned long node, const unsigned char *ftrs,

arch/x86/kernel/amd_nb.c

+2 −2
Original line number Diff line number Diff line
@@ -69,8 +69,8 @@ int amd_cache_northbridges(void) 
	while ((misc = next_northbridge(misc, amd_nb_misc_ids)) != NULL)

		i++;



	if (i == 0)

		return 0;

	if (!i)

		return -ENODEV;



	nb = kzalloc(i * sizeof(struct amd_northbridge), GFP_KERNEL);

	if (!nb)

block/ioprio.c

+2 −0
Original line number Diff line number Diff line
@@ -149,8 +149,10 @@ static int get_task_ioprio(struct task_struct *p) 
	if (ret)

		goto out;

	ret = IOPRIO_PRIO_VALUE(IOPRIO_CLASS_NONE, IOPRIO_NORM);

	task_lock(p);

	if (p->io_context)

		ret = p->io_context->ioprio;

	task_unlock(p);

out:

	return ret;

}