diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-29 14:17:30 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-29 14:17:30 -0800 |
commit | fccfde4443494df7262920565e2a43fbfbae63bc (patch) | |
tree | d4f60956707702dc62376d527c0c15ad83d11056 /arch | |
parent | 96c22a49ac125bc4ceddc0817dfb9ff3de8aea7d (diff) | |
parent | e5372cd5ef12b05ae74d608f95dc53fe06558867 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc fix from David Miller:
"Sparc T4 and later cpu bootup regression fix"
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sparc64: Fix boot on T4 and later.
Diffstat (limited to 'arch')
-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 |