tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm

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

Linus Torvalds b7dec838 d0b89bd5

+4 -1
+3
arch/arm/Makefile
··· 312 312 313 313 PHONY += bzImage $(BOOT_TARGETS) $(INSTALL_TARGETS) 314 314 315 + bootpImage uImage: zImage 316 + zImage: Image 317 + 315 318 $(BOOT_TARGETS): vmlinux 316 319 $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@ 317 320
+1 -1
arch/arm/lib/uaccess_with_memcpy.c
··· 96 96 } 97 97 98 98 /* the mmap semaphore is taken only if not in an atomic context */ 99 - atomic = in_atomic(); 99 + atomic = faulthandler_disabled(); 100 100 101 101 if (!atomic) 102 102 down_read(&current->mm->mmap_sem);