Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd273a80 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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
parents 21b27a74 f474c8c8

arch/arm/boot/compressed/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -195,5 +195,7 @@ CFLAGS_font.o := -Dstatic= 
$(obj)/font.c: $(FONTC)

	$(call cmd,shipped)



AFLAGS_hyp-stub.o := -Wa,-march=armv7-a



$(obj)/hyp-stub.S: $(srctree)/arch/$(SRCARCH)/kernel/hyp-stub.S

	$(call cmd,shipped)

arch/arm/kernel/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ obj-$(CONFIG_DEBUG_LL) += debug.o 
obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o



obj-$(CONFIG_ARM_VIRT_EXT)	+= hyp-stub.o

AFLAGS_hyp-stub.o		:=-Wa,-march=armv7-a

ifeq ($(CONFIG_ARM_PSCI),y)

obj-$(CONFIG_SMP)		+= psci_smp.o

endif

arch/arm/mm/pageattr.c

+3 −0
Original line number Diff line number Diff line
@@ -49,6 +49,9 @@ static int change_memory_common(unsigned long addr, int numpages, 
		WARN_ON_ONCE(1);

	}



	if (!numpages)

		return 0;



	if (start < MODULES_VADDR || start >= MODULES_END)

		return -EINVAL;