diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-27 09:11:25 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-27 09:11:25 +0200 |
commit | 1c816bad41fea5470e8077ae4e661f3f9b5ada64 (patch) | |
tree | 5e923d12b6284a711d66efee822ca48f95ebf1af /scripts/module-common.lds | |
parent | b0fe8f7b9b5adea2c85c72bba46e20fb21522769 (diff) | |
parent | c02ed2e75ef4c74e41e421acb4ef1494671585e8 (diff) | |
download | linux-1c816bad41fea5470e8077ae4e661f3f9b5ada64.tar.gz linux-1c816bad41fea5470e8077ae4e661f3f9b5ada64.tar.bz2 linux-1c816bad41fea5470e8077ae4e661f3f9b5ada64.zip |
Merge 4.11-rc4 into staging-next
We need the IIO fixes in here as well to handle merge issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'scripts/module-common.lds')
-rw-r--r-- | scripts/module-common.lds | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/module-common.lds b/scripts/module-common.lds index cf7e52e4781b..9b6e246a45d0 100644 --- a/scripts/module-common.lds +++ b/scripts/module-common.lds @@ -22,4 +22,6 @@ SECTIONS { . = ALIGN(8); .init_array 0 : { *(SORT(.init_array.*)) *(.init_array) } + + __jump_table 0 : ALIGN(8) { KEEP(*(__jump_table)) } } |