summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Daney <david.daney@cavium.com>2017-03-07 17:31:08 -0800
committerJessica Yu <jeyu@redhat.com>2017-03-13 09:40:28 -0700
commit5bd933fe4481688d595ae1dd0440006c8675a1a8 (patch)
tree75ab5a3e711bdf87db41e96b70885e061d2f0816
parent4495c08e84729385774601b5146d51d9e5849f81 (diff)
downloadlinux-5bd933fe4481688d595ae1dd0440006c8675a1a8.tar.gz
linux-5bd933fe4481688d595ae1dd0440006c8675a1a8.tar.bz2
linux-5bd933fe4481688d595ae1dd0440006c8675a1a8.zip
module: set .init_array alignment to 8
The proper idiom for aligning linker sections in modules is different than for built-in sections. ". = ALIGN();" followed by a forced output address of 0 does nothing, as forcing the address changes the value of ".". Use output section alignment specifier instead. Fixes: 9ddf82521c86 ("kernel: add support for .init_array.* constructors") Reviewed-by: Andrey Ryabinin <aryabinin@virtuozzo.com> Signed-off-by: David Daney <david.daney@cavium.com> Signed-off-by: Jessica Yu <jeyu@redhat.com>
-rw-r--r--scripts/module-common.lds3
1 files changed, 1 insertions, 2 deletions
diff --git a/scripts/module-common.lds b/scripts/module-common.lds
index 9b6e246a45d0..d61b9e8678e8 100644
--- a/scripts/module-common.lds
+++ b/scripts/module-common.lds
@@ -20,8 +20,7 @@ SECTIONS {
__kcrctab_unused_gpl 0 : { *(SORT(___kcrctab_unused_gpl+*)) }
__kcrctab_gpl_future 0 : { *(SORT(___kcrctab_gpl_future+*)) }
- . = ALIGN(8);
- .init_array 0 : { *(SORT(.init_array.*)) *(.init_array) }
+ .init_array 0 : ALIGN(8) { *(SORT(.init_array.*)) *(.init_array) }
__jump_table 0 : ALIGN(8) { KEEP(*(__jump_table)) }
}