Merge tag 'v4.4.11' into linux-linaro-lsk-v4.4 (510d0a3f) · Commits · e / devices / android_kernel_sony_msm8998

Makefile

+1 −1

Original line number	Diff line number	Diff line
		VERSION = 4
		PATCHLEVEL = 4
		SUBLEVEL = 10
		SUBLEVEL = 11
		EXTRAVERSION =
		NAME = Blurry Fish Butt

arch/arm/boot/dts/at91sam9x5.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -106,7 +106,7 @@

		pmc: pmc@fffffc00 {
		compatible = "atmel,at91sam9x5-pmc", "syscon";
		reg = <0xfffffc00 0x100>;
		reg = <0xfffffc00 0x200>;
		interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
		interrupt-controller;
		#address-cells = <1>;

arch/s390/include/asm/mmu.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -11,7 +11,7 @@ typedef struct {
		spinlock_t list_lock;
		struct list_head pgtable_list;
		struct list_head gmap_list;
		unsigned long asce_bits;
		unsigned long asce;
		unsigned long asce_limit;
		unsigned long vdso_base;
		/* The mmu context allocates 4K page tables. */

arch/s390/include/asm/mmu_context.h

+22 −6

Original line number	Diff line number	Diff line
		@@ -26,12 +26,28 @@ static inline int init_new_context(struct task_struct *tsk,
		mm->context.has_pgste = 0;
		mm->context.use_skey = 0;
		#endif
		if (mm->context.asce_limit == 0) {
		switch (mm->context.asce_limit) {
		case 1UL << 42:
		/*
		* forked 3-level task, fall through to set new asce with new
		* mm->pgd
		*/
		case 0:
		/* context created by exec, set asce limit to 4TB */
		mm->context.asce_bits = _ASCE_TABLE_LENGTH \|
		_ASCE_USER_BITS \| _ASCE_TYPE_REGION3;
		mm->context.asce_limit = STACK_TOP_MAX;
		} else if (mm->context.asce_limit == (1UL << 31)) {
		mm->context.asce = __pa(mm->pgd) \| _ASCE_TABLE_LENGTH \|
		_ASCE_USER_BITS \| _ASCE_TYPE_REGION3;
		break;
		case 1UL << 53:
		/* forked 4-level task, set new asce with new mm->pgd */
		mm->context.asce = __pa(mm->pgd) \| _ASCE_TABLE_LENGTH \|
		_ASCE_USER_BITS \| _ASCE_TYPE_REGION2;
		break;
		case 1UL << 31:
		/* forked 2-level compat task, set new asce with new mm->pgd */
		mm->context.asce = __pa(mm->pgd) \| _ASCE_TABLE_LENGTH \|
		_ASCE_USER_BITS \| _ASCE_TYPE_SEGMENT;
		/* pgd_alloc() did not increase mm->nr_pmds */
		mm_inc_nr_pmds(mm);
		}
		crst_table_init((unsigned long *) mm->pgd, pgd_entry_type(mm));
		@@ -42,7 +58,7 @@ static inline int init_new_context(struct task_struct *tsk,

		static inline void set_user_asce(struct mm_struct *mm)
		{
		S390_lowcore.user_asce = mm->context.asce_bits \| __pa(mm->pgd);
		S390_lowcore.user_asce = mm->context.asce;
		if (current->thread.mm_segment.ar4)
		__ctl_load(S390_lowcore.user_asce, 7, 7);
		set_cpu_flag(CIF_ASCE);
		@@ -71,7 +87,7 @@ static inline void switch_mm(struct mm_struct prev, struct mm_struct next,
		{
		int cpu = smp_processor_id();

		S390_lowcore.user_asce = next->context.asce_bits \| __pa(next->pgd);
		S390_lowcore.user_asce = next->context.asce;
		if (prev == next)
		return;
		if (MACHINE_HAS_TLB_LC)

arch/s390/include/asm/pgalloc.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -56,8 +56,8 @@ static inline unsigned long pgd_entry_type(struct mm_struct *mm)
		return _REGION2_ENTRY_EMPTY;
		}

		int crst_table_upgrade(struct mm_struct *, unsigned long limit);
		void crst_table_downgrade(struct mm_struct *, unsigned long limit);
		int crst_table_upgrade(struct mm_struct *);
		void crst_table_downgrade(struct mm_struct *);

		static inline pud_t pud_alloc_one(struct mm_struct mm, unsigned long address)
		{