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

Commit 1beb6ea3 authored by Alex Shi's avatar Alex Shi
Browse files

Merge tag 'v3.18.35' into linux-linaro-lsk-v3.18 

 This is the 3.18.35 stable release
parents 6c1be3bf b5076139

Documentation/devicetree/bindings/crypto/samsung-sss.txt

+2 −4
Original line number Diff line number Diff line
@@ -23,10 +23,8 @@ Required properties: 
  - "samsung,exynos4210-secss" for Exynos4210, Exynos4212, Exynos4412, Exynos5250,

		Exynos5260 and Exynos5420 SoCs.

- reg : Offset and length of the register set for the module

- interrupts : interrupt specifiers of SSS module interrupts, should contain

		following entries:

		- first : feed control interrupt (required for all variants),

		- second : hash interrupt (required only for samsung,s5pv210-secss).

- interrupts : interrupt specifiers of SSS module interrupts (one feed

		control interrupt).



- clocks : list of clock phandle and specifier pairs for all clocks  listed in

		clock-names property.

Makefile

+5 −4
Original line number Diff line number Diff line 
VERSION = 3

PATCHLEVEL = 18

SUBLEVEL = 34

SUBLEVEL = 35

EXTRAVERSION =

NAME = Diseased Newt
@@ -376,7 +376,7 @@ AFLAGS_MODULE = 
LDFLAGS_MODULE  =

CFLAGS_KERNEL	=

AFLAGS_KERNEL	=

CFLAGS_GCOV	= -fprofile-arcs -ftest-coverage

CFLAGS_GCOV	= -fprofile-arcs -ftest-coverage -fno-tree-loop-im





# Use USERINCLUDE when you must reference the UAPI directories only.
@@ -686,9 +686,10 @@ KBUILD_CFLAGS += $(call cc-option, -mno-global-merge,) 
KBUILD_CFLAGS += $(call cc-option, -fcatch-undefined-behavior)

else



# This warning generated too much noise in a regular build.

# Use make W=1 to enable this warning (see scripts/Makefile.build)

# These warnings generated too much noise in a regular build.

# Use make W=1 to enable them (see scripts/Makefile.build)

KBUILD_CFLAGS += $(call cc-disable-warning, unused-but-set-variable)

KBUILD_CFLAGS += $(call cc-disable-warning, unused-const-variable)

endif



ifdef CONFIG_FRAME_POINTER

arch/arm/kvm/mmu.c

+11 −6
Original line number Diff line number Diff line
@@ -841,11 +841,14 @@ static int stage2_set_pmd_huge(struct kvm *kvm, struct kvm_mmu_memory_cache 
	VM_BUG_ON(pmd_present(*pmd) && pmd_pfn(*pmd) != pmd_pfn(*new_pmd));



	old_pmd = *pmd;

	kvm_set_pmd(pmd, *new_pmd);

	if (pmd_present(old_pmd))

	if (pmd_present(old_pmd)) {

		pmd_clear(pmd);

		kvm_tlb_flush_vmid_ipa(kvm, addr);

	else

	} else {

		get_page(virt_to_page(pmd));

	}



	kvm_set_pmd(pmd, *new_pmd);

	return 0;

}
@@ -882,12 +885,14 @@ static int stage2_set_pte(struct kvm *kvm, struct kvm_mmu_memory_cache *cache, 


	/* Create 2nd stage page table mapping - Level 3 */

	old_pte = *pte;

	kvm_set_pte(pte, *new_pte);

	if (pte_present(old_pte))

	if (pte_present(old_pte)) {

		kvm_set_pte(pte, __pte(0));

		kvm_tlb_flush_vmid_ipa(kvm, addr);

	else

	} else {

		get_page(virt_to_page(pte));

	}



	kvm_set_pte(pte, *new_pte);

	return 0;

}

arch/arm64/include/asm/pgtable-hwdef.h

+0 −1
Original line number Diff line number Diff line
@@ -77,7 +77,6 @@ 
 * Section

 */

#define PMD_SECT_VALID		(_AT(pmdval_t, 1) << 0)

#define PMD_SECT_PROT_NONE	(_AT(pmdval_t, 1) << 58)

#define PMD_SECT_USER		(_AT(pmdval_t, 1) << 6)		/* AP[1] */

#define PMD_SECT_RDONLY		(_AT(pmdval_t, 1) << 7)		/* AP[2] */

#define PMD_SECT_S		(_AT(pmdval_t, 3) << 8)

arch/arm64/include/asm/pgtable.h

+3 −2
Original line number Diff line number Diff line
@@ -288,6 +288,8 @@ void pmdp_splitting_flush(struct vm_area_struct *vma, unsigned long address, 
#endif /* CONFIG_HAVE_RCU_TABLE_FREE */

#endif /* CONFIG_TRANSPARENT_HUGEPAGE */



#define pmd_present(pmd)	pte_present(pmd_pte(pmd))

#define pmd_dirty(pmd)		pte_dirty(pmd_pte(pmd))

#define pmd_young(pmd)		pte_young(pmd_pte(pmd))

#define pmd_wrprotect(pmd)	pte_pmd(pte_wrprotect(pmd_pte(pmd)))

#define pmd_mksplitting(pmd)	pte_pmd(pte_mkspecial(pmd_pte(pmd)))
@@ -295,7 +297,7 @@ void pmdp_splitting_flush(struct vm_area_struct *vma, unsigned long address, 
#define pmd_mkwrite(pmd)	pte_pmd(pte_mkwrite(pmd_pte(pmd)))

#define pmd_mkdirty(pmd)	pte_pmd(pte_mkdirty(pmd_pte(pmd)))

#define pmd_mkyoung(pmd)	pte_pmd(pte_mkyoung(pmd_pte(pmd)))

#define pmd_mknotpresent(pmd)	(__pmd(pmd_val(pmd) & ~PMD_TYPE_MASK))

#define pmd_mknotpresent(pmd)	(__pmd(pmd_val(pmd) & ~PMD_SECT_VALID))



#define __HAVE_ARCH_PMD_WRITE

#define pmd_write(pmd)		pte_write(pmd_pte(pmd))
@@ -335,7 +337,6 @@ extern pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn, 
				     unsigned long size, pgprot_t vma_prot);



#define pmd_none(pmd)		(!pmd_val(pmd))

#define pmd_present(pmd)	(pmd_val(pmd))



#define pmd_bad(pmd)		(!(pmd_val(pmd) & 2))