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

[kvmfornfv.git] / kernel / arch / s390 / kernel / jump_label.c

diff --git a/kernel/arch/s390/kernel/jump_label.c b/kernel/arch/s390/kernel/jump_label.c
index a902996..083b05f 100644 (file)
--- a/kernel/arch/s390/kernel/jump_label.c
+++ b/kernel/arch/s390/kernel/jump_label.c
@@ -44,12 +44,9 @@ static void jump_label_bug(struct jump_entry *entry, struct insn *expected,
        unsigned char *ipn = (unsigned char *)new;
 
        pr_emerg("Jump label code mismatch at %pS [%p]\n", ipc, ipc);
-       pr_emerg("Found:    %02x %02x %02x %02x %02x %02x\n",
-                ipc[0], ipc[1], ipc[2], ipc[3], ipc[4], ipc[5]);
-       pr_emerg("Expected: %02x %02x %02x %02x %02x %02x\n",
-                ipe[0], ipe[1], ipe[2], ipe[3], ipe[4], ipe[5]);
-       pr_emerg("New:      %02x %02x %02x %02x %02x %02x\n",
-                ipn[0], ipn[1], ipn[2], ipn[3], ipn[4], ipn[5]);
+       pr_emerg("Found:    %6ph\n", ipc);
+       pr_emerg("Expected: %6ph\n", ipe);
+       pr_emerg("New:      %6ph\n", ipn);
        panic("Corrupted kernel text");
 }
 
@@ -64,7 +61,7 @@ static void __jump_label_transform(struct jump_entry *entry,
 {
        struct insn old, new;
 
-       if (type == JUMP_LABEL_ENABLE) {
+       if (type == JUMP_LABEL_JMP) {
                jump_label_make_nop(entry, &old);
                jump_label_make_branch(entry, &new);
        } else {