• Paolo Bonzini's avatar
    Revert "KVM: x86: fix missed hardware breakpoints" · 92c67861
    Paolo Bonzini authored
    [the change is part of 70e4da7a, which
    is already in stable kernels 4.1.y to 4.4.y.  this part of the fix
    however was later undone, so remove the line again]
    
    The following patches were applied in the wrong order in -stable. This
    is the order as they appear in Linus' tree,
    
     [0] commit 4e422bdd ("KVM: x86: fix missed hardware breakpoints")
     [1] commit 172b2386 ("KVM: x86: fix missed hardware breakpoints")
     [2] commit 70e4da7a ("KVM: x86: fix root cause for missed hardware breakpoints")
    
    but this is the order for linux-4.4.y
    
     [1] commit fc90441e ("KVM: x86: fix missed hardware breakpoints")
     [2] commit 25e86186 ("KVM: x86: fix root cause for missed hardware breakpoints")
     [0] commit 0f6e5e26 ("KVM: x86: fix missed hardware breakpoints")
    
    The upshot is that KVM_DEBUGREG_RELOAD is always set when returning
    from kvm_arch_vcpu_load() in stable, but not in Linus' tree.
    
    This happened because [0] and [1] are the same patch.  [0] and [1] come from two
    different merges, and the later merge is trivially resolved; when [2]
    is applied it reverts both of them.  Instead, when using the [1][2][0]
    order, patches applies normally but "KVM: x86: fix missed hardware
    breakpoints" is present in the final tree.
    Reported-by: default avatarMatt Fleming <matt@codeblueprint.co.uk>
    Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
    Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
    92c67861
x86.c 212 KB