Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm (0a51b08f) · Commits · 戴 / test

Pull ARM fixes from Russell King: "Three fixes for ARM this time around: - A fix for update_sections_early() to cope with NULL ->mm pointers. - A correction to the backtrace code to allow proper backtraces. - Reinforcement of pfn_valid() with PFNs >= 4GiB" * tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm: ARM: 8901/1: add a criteria for pfn_valid of arm ARM: 8897/1: check stmfd instruction using right shift ARM: 8874/1: mm: only adjust sections of valid mm structures

arch/arm/lib/backtrace.S

+1 −1

Original line number	Diff line number	Diff line
		@@ -66,7 +66,7 @@ for_each_frame: tst frame, mask @ Check for address exceptions

		1003: ldr r2, [sv_pc, #-4] @ if stmfd sp!, {args} exists,
		ldr r3, .Ldsi+4 @ adjust saved 'pc' back one
		teq r3, r2, lsr #10 @ instruction
		teq r3, r2, lsr #11 @ instruction
		subne r0, sv_pc, #4 @ allow for mov
		subeq r0, sv_pc, #8 @ allow for mov + stmia

arch/arm/mm/init.c

+7 −1

Original line number	Diff line number	Diff line
		@@ -175,6 +175,11 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max_low,
		#ifdef CONFIG_HAVE_ARCH_PFN_VALID
		int pfn_valid(unsigned long pfn)
		{
		phys_addr_t addr = __pfn_to_phys(pfn);

		if (__phys_to_pfn(addr) != pfn)
		return 0;

		return memblock_is_map_memory(__pfn_to_phys(pfn));
		}
		EXPORT_SYMBOL(pfn_valid);
		@@ -628,6 +633,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);
		}
		set_section_perms(perms, n, true, current->active_mm);

Admin message