These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / arch / sparc / include / asm / jump_label.h

diff --git a/kernel/arch/sparc/include/asm/jump_label.h b/kernel/arch/sparc/include/asm/jump_label.h
index cc9b04a..62d0354 100644 (file)
--- a/kernel/arch/sparc/include/asm/jump_label.h
+++ b/kernel/arch/sparc/include/asm/jump_label.h
@@ -7,16 +7,33 @@
 
 #define JUMP_LABEL_NOP_SIZE 4
 
-static __always_inline bool arch_static_branch(struct static_key *key)
+static __always_inline bool arch_static_branch(struct static_key *key, bool branch)
 {
-               asm_volatile_goto("1:\n\t"
-                        "nop\n\t"
-                        "nop\n\t"
-                        ".pushsection __jump_table,  \"aw\"\n\t"
-                        ".align 4\n\t"
-                        ".word 1b, %l[l_yes], %c0\n\t"
-                        ".popsection \n\t"
-                        : :  "i" (key) : : l_yes);
+       asm_volatile_goto("1:\n\t"
+                "nop\n\t"
+                "nop\n\t"
+                ".pushsection __jump_table,  \"aw\"\n\t"
+                ".align 4\n\t"
+                ".word 1b, %l[l_yes], %c0\n\t"
+                ".popsection \n\t"
+                : :  "i" (&((char *)key)[branch]) : : l_yes);
+
+       return false;
+l_yes:
+       return true;
+}
+
+static __always_inline bool arch_static_branch_jump(struct static_key *key, bool branch)
+{
+       asm_volatile_goto("1:\n\t"
+                "b %l[l_yes]\n\t"
+                "nop\n\t"
+                ".pushsection __jump_table,  \"aw\"\n\t"
+                ".align 4\n\t"
+                ".word 1b, %l[l_yes], %c0\n\t"
+                ".popsection \n\t"
+                : :  "i" (&((char *)key)[branch]) : : l_yes);
+
        return false;
 l_yes:
        return true;