projects/linux·commit fccfde44

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

fccfde44 · Linus Torvalds <[email protected]> · 2017-11-29 14:17:30 -08:00

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.
Commit
fccfde4443494df7262920565e2a43fbfbae63bc
Parents
96c22a49 · e5372cd5

Merge commit. Changes below are compared with the first parent: 96c22a49.

Changes

1 files changed · +1 −1

FileStatusAddDelContent
arch/sparc/lib/Makefilemodified+1−1View file

arch/sparc/lib/Makefile

View file
diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile
index 0f0f76b..063556f 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