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

[firefly-linux-kernel-4.4.55.git] / arch / powerpc / net / bpf_jit_comp.c

diff --git a/arch/powerpc/net/bpf_jit_comp.c b/arch/powerpc/net/bpf_jit_comp.c
index e834f1ec23c8a4ad16c67b0d3349565e1813cf83..c427ae36374ab4fa6eb1503c15b07de2926006e6 100644 (file)
--- a/arch/powerpc/net/bpf_jit_comp.c
+++ b/arch/powerpc/net/bpf_jit_comp.c
@@ -671,16 +671,12 @@ void bpf_jit_compile(struct sk_filter *fp)
        }
 
        if (bpf_jit_enable > 1)
-               pr_info("flen=%d proglen=%u pass=%d image=%p\n",
-                      flen, proglen, pass, image);
+               /* Note that we output the base address of the code_base
+                * rather than image, since opcodes are in code_base.
+                */
+               bpf_jit_dump(flen, proglen, pass, code_base);
 
        if (image) {
-               if (bpf_jit_enable > 1)
-                       print_hex_dump(KERN_ERR, "JIT code: ",
-                                      DUMP_PREFIX_ADDRESS,
-                                      16, 1, code_base,
-                                      proglen, false);
-
                bpf_flush_icache(code_base, code_base + (proglen/4));
                /* Function descriptor nastiness: Address + TOC */
                ((u64 *)image)[0] = (u64)code_base;