Merge tag 'ronx-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux...

generic fixmaps
ARM support for CONFIG_DEBUG_RODATA

diff --cc arch/arm/kernel/vmlinux.lds.S
index 8e95aa4,3afcb6c..b31aa73
--- 1/arch/arm/kernel/vmlinux.lds.S
--- 2/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;
 -      __init_end = .;
+ #else
+ #ifdef CONFIG_ARM_KERNMEM_PERMS
+       . = ALIGN(1<<SECTION_SHIFT);
  #else
        . = ALIGN(THREAD_SIZE);
+ #endif
 +      __init_end = .;
        __data_loc = .;
  #endif
  

diff --cc arch/arm/mm/init.c
Simple merge

diff --cc arch/arm/mm/mmu.c
Simple merge