Import of kernel-4.18.0-553.79.1.el8_10
This commit is contained in:
parent
b1b30a8f37
commit
4bb7ff2b91
@ -12,7 +12,7 @@ RHEL_MINOR = 10
|
||||
#
|
||||
# Use this spot to avoid future merge conflicts.
|
||||
# Do not trim this comment.
|
||||
RHEL_RELEASE = 553.78.1
|
||||
RHEL_RELEASE = 553.79.1
|
||||
|
||||
#
|
||||
# ZSTREAM
|
||||
|
@ -3431,8 +3431,6 @@ static void svm_inject_irq(struct kvm_vcpu *vcpu)
|
||||
{
|
||||
struct vcpu_svm *svm = to_svm(vcpu);
|
||||
|
||||
BUG_ON(!(gif_set(svm)));
|
||||
|
||||
trace_kvm_inj_virq(vcpu->arch.interrupt.nr);
|
||||
++vcpu->stat.irq_injections;
|
||||
|
||||
|
@ -6339,9 +6339,14 @@ static inline int l2cap_le_command_rej(struct l2cap_conn *conn,
|
||||
if (!chan)
|
||||
goto done;
|
||||
|
||||
chan = l2cap_chan_hold_unless_zero(chan);
|
||||
if (!chan)
|
||||
goto done;
|
||||
|
||||
l2cap_chan_lock(chan);
|
||||
l2cap_chan_del(chan, ECONNREFUSED);
|
||||
l2cap_chan_unlock(chan);
|
||||
l2cap_chan_put(chan);
|
||||
|
||||
done:
|
||||
mutex_unlock(&conn->chan_lock);
|
||||
|
Loading…
Reference in New Issue
Block a user