diff options
| author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2020-11-30 16:09:25 +0100 |
|---|---|---|
| committer | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2020-11-30 16:09:25 +0100 |
| commit | 056c6e65e9f26f301c0bf066a5322cfeb0dae61a (patch) | |
| tree | 64500306cde1a666f2cc2c6467e8ce2f0f386820 | |
| parent | d79edbb716996737939c0051b605e49569c44e78 (diff) | |
| download | linux-rt-5.10-rc6-rt12-patches.tar.gz | |
[ANNOUNCE] v5.10-rc6-rt12v5.10-rc6-rt12-patches
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
| -rw-r--r-- | patches/0008-printk-inline-log_output-log_store-in-vprintk_store.patch | 8 | ||||
| -rw-r--r-- | patches/localversion.patch | 2 | ||||
| -rw-r--r-- | patches/tcp-Remove-superfluous-BH-disable-around-listening_h.patch | 10 |
3 files changed, 10 insertions, 10 deletions
diff --git a/patches/0008-printk-inline-log_output-log_store-in-vprintk_store.patch b/patches/0008-printk-inline-log_output-log_store-in-vprintk_store.patch index 8fe7c9addc02..f4cebbc4ca8f 100644 --- a/patches/0008-printk-inline-log_output-log_store-in-vprintk_store.patch +++ b/patches/0008-printk-inline-log_output-log_store-in-vprintk_store.patch @@ -57,8 +57,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> - if (dev_info) - memcpy(&r.info->dev_info, dev_info, sizeof(r.info->dev_info)); - -- /* insert message */ -- if ((flags & LOG_CONT) || !(flags & LOG_NEWLINE)) +- /* A message without a trailing newline can be continued. */ +- if (!(flags & LOG_NEWLINE)) - prb_commit(&e); - else - prb_final_commit(&e); @@ -146,7 +146,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> + goto out; + } + } - ++ + /* Store it in the record log */ + + prb_rec_init_wr(&r, text_len); @@ -174,7 +174,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> + r.info->caller_id = caller_id; + if (dev_info) + memcpy(&r.info->dev_info, dev_info, sizeof(r.info->dev_info)); -+ + + /* insert message */ + if ((lflags & LOG_CONT) || !(lflags & LOG_NEWLINE)) { + prb_commit(&e); diff --git a/patches/localversion.patch b/patches/localversion.patch index 58842b503a27..12bd473a33f5 100644 --- a/patches/localversion.patch +++ b/patches/localversion.patch @@ -10,4 +10,4 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- /dev/null +++ b/localversion-rt @@ -0,0 +1 @@ -+-rt11 ++-rt12 diff --git a/patches/tcp-Remove-superfluous-BH-disable-around-listening_h.patch b/patches/tcp-Remove-superfluous-BH-disable-around-listening_h.patch index 541bca94d796..18edcb9e409a 100644 --- a/patches/tcp-Remove-superfluous-BH-disable-around-listening_h.patch +++ b/patches/tcp-Remove-superfluous-BH-disable-around-listening_h.patch @@ -23,17 +23,17 @@ Link: https://lore.kernel.org/linux-rt-users/12d6f9879a97cd56c09fb53dee343cbb14f --- a/net/ipv4/inet_hashtables.c +++ b/net/ipv4/inet_hashtables.c -@@ -583,7 +583,9 @@ int __inet_hash(struct sock *sk, struct +@@ -635,7 +635,9 @@ int __inet_hash(struct sock *sk, struct int err = 0; if (sk->sk_state != TCP_LISTEN) { + local_bh_disable(); - inet_ehash_nolisten(sk, osk); + inet_ehash_nolisten(sk, osk, NULL); + local_bh_enable(); return 0; } WARN_ON(!sk_unhashed(sk)); -@@ -615,11 +617,8 @@ int inet_hash(struct sock *sk) +@@ -667,11 +669,8 @@ int inet_hash(struct sock *sk) { int err = 0; @@ -46,7 +46,7 @@ Link: https://lore.kernel.org/linux-rt-users/12d6f9879a97cd56c09fb53dee343cbb14f return err; } -@@ -630,17 +629,20 @@ void inet_unhash(struct sock *sk) +@@ -682,17 +681,20 @@ void inet_unhash(struct sock *sk) struct inet_hashinfo *hashinfo = sk->sk_prot->h.hashinfo; struct inet_listen_hashbucket *ilb = NULL; spinlock_t *lock; @@ -69,7 +69,7 @@ Link: https://lore.kernel.org/linux-rt-users/12d6f9879a97cd56c09fb53dee343cbb14f if (sk_unhashed(sk)) goto unlock; -@@ -653,7 +655,10 @@ void inet_unhash(struct sock *sk) +@@ -705,7 +707,10 @@ void inet_unhash(struct sock *sk) __sk_nulls_del_node_init_rcu(sk); sock_prot_inuse_add(sock_net(sk), sk->sk_prot, -1); unlock: |