Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm (b7dec838) · Commits · 戴 / test

Pull ARM fixes from Russell King: "Another couple of small ARM fixes. A patch from Masahiro Yamada who noticed that "make -jN all zImage" would end up generating bad images where N > 1, and a patch from Nicolas to fix the Marvell CPU user access optimisation code when page faults are disabled" * 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm: ARM: 8418/1: add boot image dependencies to not generate invalid images ARM: 8414/1: __copy_to_user_memcpy: fix mmap semaphore usage

arch/arm/Makefile

+3 −0

Original line number	Diff line number	Diff line
		@@ -312,6 +312,9 @@ INSTALL_TARGETS = zinstall uinstall install

		PHONY += bzImage $(BOOT_TARGETS) $(INSTALL_TARGETS)

		bootpImage uImage: zImage
		zImage: Image

		$(BOOT_TARGETS): vmlinux
		$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@

arch/arm/lib/uaccess_with_memcpy.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -96,7 +96,7 @@ __copy_to_user_memcpy(void __user to, const void from, unsigned long n)
		}

		/* the mmap semaphore is taken only if not in an atomic context */
		atomic = in_atomic();
		atomic = faulthandler_disabled();

		if (!atomic)
		down_read(&current->mm->mmap_sem);

Admin message