aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Kleine-König <ukleinek@debian.org>2018-12-18 11:31:23 +0100
committerUwe Kleine-König <ukleinek@debian.org>2018-12-18 11:31:23 +0100
commitc18b28112967cd2d52aeafb1ee14bfa68083f069 (patch)
tree9c887806b151aadbae96a0b68964e954438493ca
parent2f81bf67dce7a47e71ba06f493862f1ec964c5ce (diff)
downloadkernel_replicant_linux-c18b28112967cd2d52aeafb1ee14bfa68083f069.tar.gz
kernel_replicant_linux-c18b28112967cd2d52aeafb1ee14bfa68083f069.tar.bz2
kernel_replicant_linux-c18b28112967cd2d52aeafb1ee14bfa68083f069.zip
[rt] rebase to 4.19.10 and reenable
-rw-r--r--debian/config/defines2
-rw-r--r--debian/patches-rt/seqlock-prevent-rt-starvation.patch6
2 files changed, 4 insertions, 4 deletions
diff --git a/debian/config/defines b/debian/config/defines
index 07ccce92d4a4..fba31eb75e39 100644
--- a/debian/config/defines
+++ b/debian/config/defines
@@ -122,7 +122,7 @@ debug-info: true
signed-code: false
[featureset-rt_base]
-enabled: false
+enabled: true
[description]
part-long-up: This kernel is not suitable for SMP (multi-processor,
diff --git a/debian/patches-rt/seqlock-prevent-rt-starvation.patch b/debian/patches-rt/seqlock-prevent-rt-starvation.patch
index b73041ed7cf5..21f9d105832a 100644
--- a/debian/patches-rt/seqlock-prevent-rt-starvation.patch
+++ b/debian/patches-rt/seqlock-prevent-rt-starvation.patch
@@ -167,9 +167,9 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-static inline int neigh_hh_output(const struct hh_cache *hh, struct sk_buff *skb)
+static inline int neigh_hh_output(struct hh_cache *hh, struct sk_buff *skb)
{
+ unsigned int hh_alen = 0;
unsigned int seq;
- unsigned int hh_len;
-@@ -475,7 +475,7 @@ static inline int neigh_hh_output(const
+@@ -493,7 +493,7 @@
static inline int neigh_output(struct neighbour *n, struct sk_buff *skb)
{
@@ -178,7 +178,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
if ((n->nud_state & NUD_CONNECTED) && hh->hh_len)
return neigh_hh_output(hh, skb);
-@@ -516,7 +516,7 @@ struct neighbour_cb {
+@@ -534,7 +534,7 @@
#define NEIGH_CB(skb) ((struct neighbour_cb *)(skb)->cb)