projects / platform / kernel / linux-starfive.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f114040 80d6b0c)
Merge tag 'ronx-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 3 Nov 2014 10:12:13 +0000 (10:12 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 3 Nov 2014 10:12:13 +0000 (10:12 +0000)
generic fixmaps
ARM support for CONFIG_DEBUG_RODATA

1  2 
arch/arm/kernel/vmlinux.lds.S patch | diff1 | diff2 | blob | history
arch/arm/mm/init.c patch | diff1 | diff2 | blob | history
arch/arm/mm/mmu.c patch | diff1 | diff2 | blob | history

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
@@@ -219,8 -234,12 +234,12 @@@ SECTION
        __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
  
diff --cc arch/arm/mm/init.c
Simple merge
diff --cc arch/arm/mm/mmu.c
Simple merge
Domain: System / Kernel;