From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Mon, 3 Nov 2014 10:12:13 +0000 (+0000)
Subject: Merge tag 'ronx-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux... 
X-Git-Tag: firefly_0821_release~176^2~2697^2^2
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=06e944b8e5fc4bec83f102f98c1ee4f972f5f072;p=firefly-linux-kernel-4.4.55.git

Merge tag 'ronx-next' of git://git./linux/kernel/git/kees/linux into devel-stable

generic fixmaps
ARM support for CONFIG_DEBUG_RODATA
---

06e944b8e5fc4bec83f102f98c1ee4f972f5f072
diff --cc arch/arm/kernel/vmlinux.lds.S
index 8e95aa47457a,3afcb6c2cf06..b31aa73e8076
--- a/arch/arm/kernel/vmlinux.lds.S
+++ b/arch/arm/kernel/vmlinux.lds.S
@@@ -218,9 -233,13 +233,13 @@@ SECTION
  #ifdef CONFIG_XIP_KERNEL
  	__data_loc = ALIGN(4);		/* location in binary */
  	. = PAGE_OFFSET + TEXT_OFFSET;
+ #else
 -	__init_end = .;
+ #ifdef CONFIG_ARM_KERNMEM_PERMS
+ 	. = ALIGN(1<<SECTION_SHIFT);
  #else
  	. = ALIGN(THREAD_SIZE);
+ #endif
 +	__init_end = .;
  	__data_loc = .;
  #endif