Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

Pull x86 cleanups from Ingo Molnar:
 "Misc cleanups"

* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/apm: Fix spelling mistake: "caculate" -> "calculate"
  x86/mtrr: Rename main.c to mtrr.c and remove duplicate prefixes
  x86: Remove pr_fmt duplicate logging prefixes
  x86/early-quirks: Rename duplicate define of dev_err
  x86/bpf: Clean up non-standard comments, to make the code more readable

diff --cc arch/x86/kernel/apm_32.c
Simple merge

diff --cc arch/x86/kernel/cpu/mtrr/mtrr.c
Simple merge

diff --cc arch/x86/kernel/uprobes.c
Simple merge

diff --cc arch/x86/net/bpf_jit_comp.c
index 263c845,ac4df93..d765ace
--- 1/arch/x86/net/bpf_jit_comp.c
--- 2/arch/x86/net/bpf_jit_comp.c
+++ b/arch/x86/net/bpf_jit_comp.c
@@@ -1027,19 -1055,9 +1055,19 @@@ emit_cond_jmp:                /* Convert BPF opcode t
                        break;
  
                case BPF_JMP | BPF_JA:
 -                      jmp_offset = addrs[i + insn->off] - addrs[i];
 +                      if (insn->off == -1)
 +                              /* -1 jmp instructions will always jump
 +                               * backwards two bytes. Explicitly handling
 +                               * this case avoids wasting too many passes
 +                               * when there are long sequences of replaced
 +                               * dead code.
 +                               */
 +                              jmp_offset = -2;
 +                      else
 +                              jmp_offset = addrs[i + insn->off] - addrs[i];
 +
                        if (!jmp_offset)
-                               /* optimize out nop jumps */
+                               /* Optimize out nop jumps */
                                break;
  emit_jmp:
                        if (is_imm8(jmp_offset)) {