diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2022-10-15 11:32:03 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-10-18 20:25:06 +0200 |
| commit | 060aa0021f688d455767b553cfe95e29b6559b7a (patch) | |
| tree | 159034c8560900cbf6eedde93b4c6c64bbfc331c /target/linux/generic | |
| parent | 32f8c6fdf8770568b40bc85687091de99713c1b3 (diff) | |
| download | upstream-060aa0021f688d455767b553cfe95e29b6559b7a.tar.gz upstream-060aa0021f688d455767b553cfe95e29b6559b7a.tar.bz2 upstream-060aa0021f688d455767b553cfe95e29b6559b7a.zip | |
kernel: bump 5.4 to 5.4.219
Merged upstream:
bcm53xx/patches-5.4/083-v6.0-clk-iproc-Do-not-rely-on-node-name-for-correct-PLL-s.patch
Compile-tested: x86/64
Run-tested: x86/64
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic')
| -rw-r--r-- | target/linux/generic/pending-5.4/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch | 2 | ||||
| -rw-r--r-- | target/linux/generic/pending-5.4/834-ledtrig-libata.patch | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/generic/pending-5.4/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch b/target/linux/generic/pending-5.4/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch index 09e8267034..680ea7e9b8 100644 --- a/target/linux/generic/pending-5.4/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch +++ b/target/linux/generic/pending-5.4/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch @@ -71,7 +71,7 @@ Signed-off-by: Tobias Wolf <dev-NTEO@vplace.de> --- a/mm/page_alloc.c +++ b/mm/page_alloc.c -@@ -6886,7 +6886,7 @@ static void __ref alloc_node_mem_map(str +@@ -6931,7 +6931,7 @@ static void __ref alloc_node_mem_map(str mem_map = NODE_DATA(0)->node_mem_map; #if defined(CONFIG_HAVE_MEMBLOCK_NODE_MAP) || defined(CONFIG_FLATMEM) if (page_to_pfn(mem_map) != pgdat->node_start_pfn) diff --git a/target/linux/generic/pending-5.4/834-ledtrig-libata.patch b/target/linux/generic/pending-5.4/834-ledtrig-libata.patch index 1c6eb8cd9b..4bb74ed5b1 100644 --- a/target/linux/generic/pending-5.4/834-ledtrig-libata.patch +++ b/target/linux/generic/pending-5.4/834-ledtrig-libata.patch @@ -65,7 +65,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> /** * ata_build_rw_tf - Build ATA taskfile for given read/write request * @tf: Target ATA taskfile -@@ -5155,6 +5168,9 @@ struct ata_queued_cmd *ata_qc_new_init(s +@@ -5159,6 +5172,9 @@ struct ata_queued_cmd *ata_qc_new_init(s if (tag < 0) return NULL; } @@ -75,7 +75,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> qc = __ata_qc_from_tag(ap, tag); qc->tag = qc->hw_tag = tag; -@@ -6091,6 +6107,9 @@ struct ata_port *ata_port_alloc(struct a +@@ -6095,6 +6111,9 @@ struct ata_port *ata_port_alloc(struct a ap->stats.unhandled_irq = 1; ap->stats.idle_irq = 1; #endif @@ -85,7 +85,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> ata_sff_port_init(ap); return ap; -@@ -6126,6 +6145,12 @@ static void ata_host_release(struct kref +@@ -6130,6 +6149,12 @@ static void ata_host_release(struct kref kfree(ap->pmp_link); kfree(ap->slave_link); @@ -98,7 +98,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> kfree(ap); host->ports[i] = NULL; } -@@ -6589,7 +6614,23 @@ int ata_host_register(struct ata_host *h +@@ -6593,7 +6618,23 @@ int ata_host_register(struct ata_host *h host->ports[i]->print_id = atomic_inc_return(&ata_print_id); host->ports[i]->local_port_no = i + 1; } |