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

[mirror_ubuntu-bionic-kernel.git] / arch / sparc / lib / NG4patch.S

diff --git a/arch/sparc/lib/NG4patch.S b/arch/sparc/lib/NG4patch.S
index aa58ab39f9a6293ab496f61d21ba40daed5e7df6..37866175c921e2bfdca67d990a2a18cf5a24f08b 100644 (file)
--- a/arch/sparc/lib/NG4patch.S
+++ b/arch/sparc/lib/NG4patch.S
@@ -4,6 +4,8 @@
  * Copyright (C) 2012 David S. Miller <davem@davemloft.net>
  */
 
+#include <linux/linkage.h>
+
 #define BRANCH_ALWAYS  0x10680000
 #define NOP            0x01000000
 #define NG_DO_PATCH(OLD, NEW)  \
@@ -53,3 +55,10 @@ niagara4_patch_pageops:
        retl
         nop
        .size   niagara4_patch_pageops,.-niagara4_patch_pageops
+
+ENTRY(niagara4_patch_fls)
+       NG_DO_PATCH(fls, NG4fls)
+       NG_DO_PATCH(__fls, __NG4fls)
+       retl
+        nop
+ENDPROC(niagara4_patch_fls)