-
-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
No manual changes needed. Link: openwrt/openwrt#16882 Signed-off-by: Hauke Mehrtens <[email protected]>
- Loading branch information
Showing
12 changed files
with
77 additions
and
77 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
LINUX_VERSION-5.15 = .170 | ||
LINUX_KERNEL_HASH-5.15.170 = fd596545a3d6d93196db3fa29e4926e60900b9c05b3b9ccdee9e35d8e376e7a9 | ||
LINUX_VERSION-5.15 = .171 | ||
LINUX_KERNEL_HASH-5.15.171 = 2953e064d8123c4c22c4fd48011378d73c8b99a3bf3d989e33f4f5c8f82f2a3b |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -48,7 +48,7 @@ Signed-off-by: David Plowman <[email protected]> | |
static bool _init_on_alloc_enabled_early __read_mostly | ||
= IS_ENABLED(CONFIG_INIT_ON_ALLOC_DEFAULT_ON); | ||
static int __init early_init_on_alloc(char *buf) | ||
@@ -2980,12 +3001,13 @@ __rmqueue(struct zone *zone, unsigned in | ||
@@ -2983,12 +3004,13 @@ __rmqueue(struct zone *zone, unsigned in | ||
if (IS_ENABLED(CONFIG_CMA)) { | ||
/* | ||
* Balance movable allocations between regular and CMA areas by | ||
|
@@ -64,4 +64,4 @@ Signed-off-by: David Plowman <[email protected]> | |
+ * _alloc_in_cma_threshold) { | ||
page = __rmqueue_cma_fallback(zone, order); | ||
if (page) | ||
goto out; | ||
return page; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -354,7 +354,7 @@ Signed-off-by: Andrew Morton <[email protected]> | |
static void mem_cgroup_css_free(struct cgroup_subsys_state *css) | ||
--- a/mm/page_alloc.c | ||
+++ b/mm/page_alloc.c | ||
@@ -7663,6 +7663,7 @@ static void __init free_area_init_node(i | ||
@@ -7704,6 +7704,7 @@ static void __init free_area_init_node(i | ||
pgdat_set_deferred_range(pgdat); | ||
|
||
free_area_init_core(pgdat); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -71,23 +71,23 @@ Signed-off-by: Jakub Kicinski <[email protected]> | |
ret = stmmac_hw_setup(dev, true); | ||
if (ret < 0) { | ||
netdev_err(priv->dev, "%s: Hw setup failed\n", __func__); | ||
@@ -6399,6 +6392,7 @@ void stmmac_enable_rx_queue(struct stmma | ||
@@ -6411,6 +6404,7 @@ void stmmac_enable_rx_queue(struct stmma | ||
return; | ||
} | ||
|
||
+ stmmac_reset_rx_queue(priv, queue); | ||
stmmac_clear_rx_descriptors(priv, queue); | ||
|
||
stmmac_init_rx_chan(priv, priv->ioaddr, priv->plat->dma_cfg, | ||
@@ -6460,6 +6454,7 @@ void stmmac_enable_tx_queue(struct stmma | ||
@@ -6472,6 +6466,7 @@ void stmmac_enable_tx_queue(struct stmma | ||
return; | ||
} | ||
|
||
+ stmmac_reset_tx_queue(priv, queue); | ||
stmmac_clear_tx_descriptors(priv, queue); | ||
|
||
stmmac_init_tx_chan(priv, priv->ioaddr, priv->plat->dma_cfg, | ||
@@ -7387,6 +7382,25 @@ int stmmac_suspend(struct device *dev) | ||
@@ -7399,6 +7394,25 @@ int stmmac_suspend(struct device *dev) | ||
} | ||
EXPORT_SYMBOL_GPL(stmmac_suspend); | ||
|
||
|
@@ -113,7 +113,7 @@ Signed-off-by: Jakub Kicinski <[email protected]> | |
/** | ||
* stmmac_reset_queues_param - reset queue parameters | ||
* @priv: device pointer | ||
@@ -7397,22 +7411,11 @@ static void stmmac_reset_queues_param(st | ||
@@ -7409,22 +7423,11 @@ static void stmmac_reset_queues_param(st | ||
u32 tx_cnt = priv->plat->tx_queues_to_use; | ||
u32 queue; | ||
|
||
|
Oops, something went wrong.