projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'ronx-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
kernel
/
vmlinux.lds.S
diff --git
a/arch/arm/kernel/vmlinux.lds.S
b/arch/arm/kernel/vmlinux.lds.S
index 3afcb6c2cf06040b5445f9c167a0d477e3650953..b31aa73e80765539ce14018a1ed2fdc0a1a81ddc 100644
(file)
--- a/
arch/arm/kernel/vmlinux.lds.S
+++ b/
arch/arm/kernel/vmlinux.lds.S
@@
-234,12
+234,12
@@
SECTIONS
__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