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

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

Pull ARM fixes from Russell King:
"Just two ARM fixes this time: one to fix the hyp-stub for older ARM
CPUs, and another to fix the set_memory_xx() permission functions to
deal with zero sizes correctly"

* 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
ARM: 8544/1: set_memory_xx fixes
ARM: 8534/1: virt: fix hyp-stub build for pre-ARMv7 CPUs

Linus Torvalds 10 years ago dd273a80 21b27a74

3 changed files

expand all

arch

arm

boot

compressed

Makefile

kernel

Makefile

pageattr.c

arch/arm/boot/compressed/Makefile

··· 195 195 $(obj)/font.c: $(FONTC) 196 196 $(call cmd,shipped) 197 197 198 + AFLAGS_hyp-stub.o := -Wa,-march=armv7-a 199 + 198 200 $(obj)/hyp-stub.S: $(srctree)/arch/$(SRCARCH)/kernel/hyp-stub.S 199 201 $(call cmd,shipped)

arch/arm/kernel/Makefile

··· 88 88 obj-$(CONFIG_EARLY_PRINTK) += early_printk.o 89 89 90 90 obj-$(CONFIG_ARM_VIRT_EXT) += hyp-stub.o 91 + AFLAGS_hyp-stub.o :=-Wa,-march=armv7-a 91 92 ifeq ($(CONFIG_ARM_PSCI),y) 92 93 obj-$(CONFIG_SMP) += psci_smp.o 93 94 endif

arch/arm/mm/pageattr.c

··· 49 49 WARN_ON_ONCE(1); 50 50 } 51 51 52 + if (!numpages) 53 + return 0; 54 + 52 55 if (start < MODULES_VADDR || start >= MODULES_END) 53 56 return -EINVAL; 54 57

Configure Feed

Configure Feed