Skip to content

Commit

Permalink
refresh patches
Browse files Browse the repository at this point in the history
  • Loading branch information
tiffany-929 committed Jul 15, 2024
1 parent 6e036da commit a96a848
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 46 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@
+ else if (likely(!atomic_dec_and_test(&skb->users)))
+ return;
+ */
+
+ /* If possible we'd like to recycle any skb rather than just free it,
+ * but in order to do that we need to release any head state too.
+ * We don't want to do this later because we'll be in a pre-emption
Expand All @@ -364,7 +364,7 @@
+ */
+ if (likely(skb->head) && likely(skb_recycler_consume(skb)))
+ return;
+
+#ifdef CONFIG_TRACEPOINTS
trace_consume_skb(skb, __builtin_return_address(0));
- __kfree_skb(skb);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
diff --git a/arch/arm64/boot/dts/qcom/ipq6010-wax214.dts b/arch/arm64/boot/dts/qcom/ipq6010-wax214.dts
index 90a4828c17..bb13f6fb4a 100644
--- a/arch/arm64/boot/dts/qcom/ipq6010-wax214.dts
+++ b/arch/arm64/boot/dts/qcom/ipq6010-wax214.dts
@@ -25,7 +25,7 @@
Expand All @@ -11,8 +9,6 @@ index 90a4828c17..bb13f6fb4a 100644
};

keys {
diff --git a/arch/arm64/boot/dts/qcom/ipq6018-fap650.dts b/arch/arm64/boot/dts/qcom/ipq6018-fap650.dts
index e9ebcc9063..7420dc75dc 100644
--- a/arch/arm64/boot/dts/qcom/ipq6018-fap650.dts
+++ b/arch/arm64/boot/dts/qcom/ipq6018-fap650.dts
@@ -30,7 +30,7 @@
Expand All @@ -24,8 +20,6 @@ index e9ebcc9063..7420dc75dc 100644
};

keys {
diff --git a/arch/arm64/boot/dts/qcom/ipq8070-cax1800.dts b/arch/arm64/boot/dts/qcom/ipq8070-cax1800.dts
index 4359c3d5b1..8ca6eb6dac 100644
--- a/arch/arm64/boot/dts/qcom/ipq8070-cax1800.dts
+++ b/arch/arm64/boot/dts/qcom/ipq8070-cax1800.dts
@@ -27,7 +27,7 @@
Expand All @@ -37,8 +31,6 @@ index 4359c3d5b1..8ca6eb6dac 100644
};

keys {
diff --git a/arch/arm64/boot/dts/qcom/ipq8070-rm2-6.dts b/arch/arm64/boot/dts/qcom/ipq8070-rm2-6.dts
index 52a9468f99..7ba0bda97c 100644
--- a/arch/arm64/boot/dts/qcom/ipq8070-rm2-6.dts
+++ b/arch/arm64/boot/dts/qcom/ipq8070-rm2-6.dts
@@ -33,7 +33,7 @@
Expand All @@ -50,8 +42,6 @@ index 52a9468f99..7ba0bda97c 100644
};

keys {
diff --git a/arch/arm64/boot/dts/qcom/ipq8071-ax3600.dtsi b/arch/arm64/boot/dts/qcom/ipq8071-ax3600.dtsi
index c2c5f4ce83..f198df9183 100644
--- a/arch/arm64/boot/dts/qcom/ipq8071-ax3600.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq8071-ax3600.dtsi
@@ -20,7 +20,7 @@
Expand All @@ -63,8 +53,6 @@ index c2c5f4ce83..f198df9183 100644
};

keys {
diff --git a/arch/arm64/boot/dts/qcom/ipq8071-eap102.dts b/arch/arm64/boot/dts/qcom/ipq8071-eap102.dts
index bcf0285220..760a00fc7f 100644
--- a/arch/arm64/boot/dts/qcom/ipq8071-eap102.dts
+++ b/arch/arm64/boot/dts/qcom/ipq8071-eap102.dts
@@ -30,7 +30,7 @@
Expand All @@ -76,8 +64,6 @@ index bcf0285220..760a00fc7f 100644
};

keys {
diff --git a/arch/arm64/boot/dts/qcom/ipq8071-mf269.dts b/arch/arm64/boot/dts/qcom/ipq8071-mf269.dts
index c5b21bd29a..3ff700fe63 100644
--- a/arch/arm64/boot/dts/qcom/ipq8071-mf269.dts
+++ b/arch/arm64/boot/dts/qcom/ipq8071-mf269.dts
@@ -25,7 +25,7 @@
Expand All @@ -89,8 +75,6 @@ index c5b21bd29a..3ff700fe63 100644
};

keys {
diff --git a/arch/arm64/boot/dts/qcom/ipq8072-aw1000.dts b/arch/arm64/boot/dts/qcom/ipq8072-aw1000.dts
index fbad0e79e5..28b5bc3506 100644
--- a/arch/arm64/boot/dts/qcom/ipq8072-aw1000.dts
+++ b/arch/arm64/boot/dts/qcom/ipq8072-aw1000.dts
@@ -35,7 +35,7 @@
Expand All @@ -102,8 +86,6 @@ index fbad0e79e5..28b5bc3506 100644
};

gpio-export {
diff --git a/arch/arm64/boot/dts/qcom/ipq8072-ax880.dts b/arch/arm64/boot/dts/qcom/ipq8072-ax880.dts
index af5a497b39..3510705344 100644
--- a/arch/arm64/boot/dts/qcom/ipq8072-ax880.dts
+++ b/arch/arm64/boot/dts/qcom/ipq8072-ax880.dts
@@ -30,7 +30,7 @@
Expand All @@ -115,8 +97,6 @@ index af5a497b39..3510705344 100644
};

keys {
diff --git a/arch/arm64/boot/dts/qcom/ipq8072-ax9000.dts b/arch/arm64/boot/dts/qcom/ipq8072-ax9000.dts
index fe5a136722..b555b9e6d5 100644
--- a/arch/arm64/boot/dts/qcom/ipq8072-ax9000.dts
+++ b/arch/arm64/boot/dts/qcom/ipq8072-ax9000.dts
@@ -26,7 +26,7 @@
Expand All @@ -128,8 +108,6 @@ index fe5a136722..b555b9e6d5 100644
};

keys {
diff --git a/arch/arm64/boot/dts/qcom/ipq8072-dl-wrx36.dts b/arch/arm64/boot/dts/qcom/ipq8072-dl-wrx36.dts
index 24dd51b47f..8096807d3a 100644
--- a/arch/arm64/boot/dts/qcom/ipq8072-dl-wrx36.dts
+++ b/arch/arm64/boot/dts/qcom/ipq8072-dl-wrx36.dts
@@ -32,7 +32,7 @@
Expand All @@ -141,8 +119,6 @@ index 24dd51b47f..8096807d3a 100644
};

keys {
diff --git a/arch/arm64/boot/dts/qcom/ipq8072-mx5300.dts b/arch/arm64/boot/dts/qcom/ipq8072-mx5300.dts
index 6e2e95c00a..02106cf753 100644
--- a/arch/arm64/boot/dts/qcom/ipq8072-mx5300.dts
+++ b/arch/arm64/boot/dts/qcom/ipq8072-mx5300.dts
@@ -33,7 +33,7 @@
Expand All @@ -154,8 +130,6 @@ index 6e2e95c00a..02106cf753 100644
};

keys {
diff --git a/arch/arm64/boot/dts/qcom/ipq8072-mx8500.dts b/arch/arm64/boot/dts/qcom/ipq8072-mx8500.dts
index a4fcb3e18d..075faf8f12 100644
--- a/arch/arm64/boot/dts/qcom/ipq8072-mx8500.dts
+++ b/arch/arm64/boot/dts/qcom/ipq8072-mx8500.dts
@@ -25,7 +25,7 @@
Expand All @@ -167,8 +141,6 @@ index a4fcb3e18d..075faf8f12 100644
};

gpio_export {
diff --git a/arch/arm64/boot/dts/qcom/ipq8072-wax218.dts b/arch/arm64/boot/dts/qcom/ipq8072-wax218.dts
index 2c1e0f5e47..2354aff1bb 100644
--- a/arch/arm64/boot/dts/qcom/ipq8072-wax218.dts
+++ b/arch/arm64/boot/dts/qcom/ipq8072-wax218.dts
@@ -27,7 +27,7 @@
Expand All @@ -180,8 +152,6 @@ index 2c1e0f5e47..2354aff1bb 100644
};

keys {
diff --git a/arch/arm64/boot/dts/qcom/ipq8072-wax620.dts b/arch/arm64/boot/dts/qcom/ipq8072-wax620.dts
index 5762899889..32b84c7560 100644
--- a/arch/arm64/boot/dts/qcom/ipq8072-wax620.dts
+++ b/arch/arm64/boot/dts/qcom/ipq8072-wax620.dts
@@ -30,7 +30,7 @@
Expand All @@ -193,8 +163,6 @@ index 5762899889..32b84c7560 100644
};

keys {
diff --git a/arch/arm64/boot/dts/qcom/ipq8072-wpq873.dts b/arch/arm64/boot/dts/qcom/ipq8072-wpq873.dts
index ebc68e15a8..d6690d1b66 100644
--- a/arch/arm64/boot/dts/qcom/ipq8072-wpq873.dts
+++ b/arch/arm64/boot/dts/qcom/ipq8072-wpq873.dts
@@ -31,7 +31,7 @@
Expand All @@ -206,8 +174,6 @@ index ebc68e15a8..d6690d1b66 100644
};

keys {
diff --git a/arch/arm64/boot/dts/qcom/ipq8072-zbt-z800ax.dts b/arch/arm64/boot/dts/qcom/ipq8072-zbt-z800ax.dts
index 2398bf9295..99b746245e 100644
--- a/arch/arm64/boot/dts/qcom/ipq8072-zbt-z800ax.dts
+++ b/arch/arm64/boot/dts/qcom/ipq8072-zbt-z800ax.dts
@@ -33,7 +33,7 @@
Expand All @@ -219,8 +185,6 @@ index 2398bf9295..99b746245e 100644
};

gpio-export {
diff --git a/arch/arm64/boot/dts/qcom/ipq8074-rax120v2.dts b/arch/arm64/boot/dts/qcom/ipq8074-rax120v2.dts
index 5331f98587..57e0bde3cb 100644
--- a/arch/arm64/boot/dts/qcom/ipq8074-rax120v2.dts
+++ b/arch/arm64/boot/dts/qcom/ipq8074-rax120v2.dts
@@ -25,7 +25,7 @@
Expand All @@ -232,8 +196,6 @@ index 5331f98587..57e0bde3cb 100644
};

keys {
diff --git a/arch/arm64/boot/dts/qcom/ipq8074-sxk80.dtsi b/arch/arm64/boot/dts/qcom/ipq8074-sxk80.dtsi
index 7a29f945d5..315472635b 100644
--- a/arch/arm64/boot/dts/qcom/ipq8074-sxk80.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq8074-sxk80.dtsi
@@ -26,7 +26,7 @@
Expand All @@ -245,8 +207,6 @@ index 7a29f945d5..315472635b 100644
};

keys {
diff --git a/arch/arm64/boot/dts/qcom/ipq8074-wax630.dts b/arch/arm64/boot/dts/qcom/ipq8074-wax630.dts
index d241ae642a..bb400beb0f 100644
--- a/arch/arm64/boot/dts/qcom/ipq8074-wax630.dts
+++ b/arch/arm64/boot/dts/qcom/ipq8074-wax630.dts
@@ -29,7 +29,7 @@
Expand All @@ -258,8 +218,6 @@ index d241ae642a..bb400beb0f 100644
};

keys {
diff --git a/arch/arm64/boot/dts/qcom/ipq8074-wxr-5950ax12.dts b/arch/arm64/boot/dts/qcom/ipq8074-wxr-5950ax12.dts
index 5f463b6c62..52d9f9c4e9 100644
--- a/arch/arm64/boot/dts/qcom/ipq8074-wxr-5950ax12.dts
+++ b/arch/arm64/boot/dts/qcom/ipq8074-wxr-5950ax12.dts
@@ -25,7 +25,7 @@
Expand All @@ -271,8 +229,6 @@ index 5f463b6c62..52d9f9c4e9 100644
};

leds {
diff --git a/arch/arm64/boot/dts/qcom/ipq8174-mx4200.dtsi b/arch/arm64/boot/dts/qcom/ipq8174-mx4200.dtsi
index 741c00bdcb..a4a379bb4a 100644
--- a/arch/arm64/boot/dts/qcom/ipq8174-mx4200.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq8174-mx4200.dtsi
@@ -30,7 +30,7 @@
Expand Down

0 comments on commit a96a848

Please sign in to comment.