drop 4.9 print patch

diff --git a/queue-4.9/series b/queue-4.9/series
index 9cdacf3311cbec62a27dfc341af53c0fc8302d99..10346d68197198a8e6c68e542a3ed8c9bff41758 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -43,7 +43,6 @@ x86-msr-add-definitions-for-new-speculation-control-msrs.patch
 x86-pti-do-not-enable-pti-on-cpus-which-are-not-vulnerable-to-meltdown.patch
 x86-cpufeature-blacklist-spec_ctrl-pred_cmd-on-early-spectre-v2-microcodes.patch
 x86-speculation-add-basic-ibpb-indirect-branch-prediction-barrier-support.patch
-x86-alternative-print-unadorned-pointers.patch
 x86-nospec-fix-header-guards-names.patch
 x86-bugs-drop-one-mitigation-from-dmesg.patch
 x86-cpu-bugs-make-retpoline-module-warning-conditional.patch

diff --git a/queue-4.9/x86-alternative-print-unadorned-pointers.patch b/queue-4.9/x86-alternative-print-unadorned-pointers.patch
deleted file mode 100644 (file)
index 79ec761..0000000
--- a/queue-4.9/x86-alternative-print-unadorned-pointers.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From foo@baz Thu Feb  8 03:30:27 CET 2018
-From: Borislav Petkov <bp@suse.de>
-Date: Fri, 26 Jan 2018 13:11:36 +0100
-Subject: x86/alternative: Print unadorned pointers
-
-From: Borislav Petkov <bp@suse.de>
-
-(cherry picked from commit 0e6c16c652cadaffd25a6bb326ec10da5bcec6b4)
-
-After commit ad67b74d2469 ("printk: hash addresses printed with %p")
-pointers are being hashed when printed. However, this makes the alternative
-debug output completely useless. Switch to %px in order to see the
-unadorned kernel pointers.
-
-Signed-off-by: Borislav Petkov <bp@suse.de>
-Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-Cc: riel@redhat.com
-Cc: ak@linux.intel.com
-Cc: peterz@infradead.org
-Cc: David Woodhouse <dwmw2@infradead.org>
-Cc: jikos@kernel.org
-Cc: luto@amacapital.net
-Cc: dave.hansen@intel.com
-Cc: torvalds@linux-foundation.org
-Cc: keescook@google.com
-Cc: Josh Poimboeuf <jpoimboe@redhat.com>
-Cc: tim.c.chen@linux.intel.com
-Cc: gregkh@linux-foundation.org
-Cc: pjt@google.com
-Link: https://lkml.kernel.org/r/20180126121139.31959-2-bp@alien8.de
-Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- arch/x86/kernel/alternative.c |   14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
---- a/arch/x86/kernel/alternative.c
-+++ b/arch/x86/kernel/alternative.c
-@@ -298,7 +298,7 @@ recompute_jump(struct alt_instr *a, u8 *
-       tgt_rip  = next_rip + o_dspl;
-       n_dspl = tgt_rip - orig_insn;
- 
--      DPRINTK("target RIP: %p, new_displ: 0x%x", tgt_rip, n_dspl);
-+      DPRINTK("target RIP: %px, new_displ: 0x%x", tgt_rip, n_dspl);
- 
-       if (tgt_rip - orig_insn >= 0) {
-               if (n_dspl - 2 <= 127)
-@@ -352,7 +352,7 @@ static void __init_or_module optimize_no
-       sync_core();
-       local_irq_restore(flags);
- 
--      DUMP_BYTES(instr, a->instrlen, "%p: [%d:%d) optimized NOPs: ",
-+      DUMP_BYTES(instr, a->instrlen, "%px: [%d:%d) optimized NOPs: ",
-                  instr, a->instrlen - a->padlen, a->padlen);
- }
- 
-@@ -370,7 +370,7 @@ void __init_or_module apply_alternatives
-       u8 *instr, *replacement;
-       u8 insnbuf[MAX_PATCH_LEN];
- 
--      DPRINTK("alt table %p -> %p", start, end);
-+      DPRINTK("alt table %px, -> %px", start, end);
-       /*
-        * The scan order should be from start to end. A later scanned
-        * alternative code can overwrite previously scanned alternative code.
-@@ -394,14 +394,14 @@ void __init_or_module apply_alternatives
-                       continue;
-               }
- 
--              DPRINTK("feat: %d*32+%d, old: (%p, len: %d), repl: (%p, len: %d), pad: %d",
-+              DPRINTK("feat: %d*32+%d, old: (%px len: %d), repl: (%px, len: %d), pad: %d",
-                       a->cpuid >> 5,
-                       a->cpuid & 0x1f,
-                       instr, a->instrlen,
-                       replacement, a->replacementlen, a->padlen);
- 
--              DUMP_BYTES(instr, a->instrlen, "%p: old_insn: ", instr);
--              DUMP_BYTES(replacement, a->replacementlen, "%p: rpl_insn: ", replacement);
-+              DUMP_BYTES(instr, a->instrlen, "%px: old_insn: ", instr);
-+              DUMP_BYTES(replacement, a->replacementlen, "%px: rpl_insn: ", replacement);
- 
-               memcpy(insnbuf, replacement, a->replacementlen);
-               insnbuf_sz = a->replacementlen;
-@@ -422,7 +422,7 @@ void __init_or_module apply_alternatives
-                                a->instrlen - a->replacementlen);
-                       insnbuf_sz += a->instrlen - a->replacementlen;
-               }
--              DUMP_BYTES(insnbuf, insnbuf_sz, "%p: final_insn: ", instr);
-+              DUMP_BYTES(insnbuf, insnbuf_sz, "%px: final_insn: ", instr);
- 
-               text_poke_early(instr, insnbuf, insnbuf_sz);
-       }