diff options
author | David S. Miller <davem@davemloft.net> | 2017-11-29 15:09:29 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-11-29 15:09:29 -0500 |
commit | e5372cd5ef12b05ae74d608f95dc53fe06558867 (patch) | |
tree | 90003880eb6a52bbad34758860034b11e7b37bb0 /arch/sparc | |
parent | 0c86a6bd85ff0629cd2c5141027fc1c8bb6cde9c (diff) | |
download | linux-stable-e5372cd5ef12b05ae74d608f95dc53fe06558867.tar.gz linux-stable-e5372cd5ef12b05ae74d608f95dc53fe06558867.tar.bz2 linux-stable-e5372cd5ef12b05ae74d608f95dc53fe06558867.zip |
sparc64: Fix boot on T4 and later.
If we don't put the NG4fls.o object into the same part of
the link as the generic sparc64 objects for fls() and __fls()
then the relocation in the branch we use for patching will
not fit.
Move NG4fls.o into lib-y to fix this problem.
Fixes: 46ad8d2d22c1 ("sparc64: Use sparc optimized fls and __fls for T4 and above")
Signed-off-by: David S. Miller <davem@davemloft.net>
Reported-by: Anatoly Pugachev <matorola@gmail.com>
Tested-by: Anatoly Pugachev <matorola@gmail.com>
Diffstat (limited to 'arch/sparc')
-rw-r--r-- | arch/sparc/lib/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile index 0f0f76b4f6cd..063556fe2cb1 100644 --- a/arch/sparc/lib/Makefile +++ b/arch/sparc/lib/Makefile @@ -19,7 +19,7 @@ lib-$(CONFIG_SPARC32) += muldi3.o bitext.o cmpdi2.o lib-$(CONFIG_SPARC64) += multi3.o lib-$(CONFIG_SPARC64) += fls.o lib-$(CONFIG_SPARC64) += fls64.o -obj-$(CONFIG_SPARC64) += NG4fls.o +lib-$(CONFIG_SPARC64) += NG4fls.o lib-$(CONFIG_SPARC64) += copy_page.o clear_page.o bzero.o lib-$(CONFIG_SPARC64) += csum_copy.o csum_copy_from_user.o csum_copy_to_user.o |