diff options
| author | John Audia <graysky@archlinux.us> | 2021-02-17 05:58:14 -0500 |
|---|---|---|
| committer | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2021-02-18 20:04:50 +0100 |
| commit | 5d3a6fd970619dfc55f8259035c3027d7613a2a6 (patch) | |
| tree | 2a71f22994a12b2589e061d6e821c8c93fb9cb29 /target/linux/layerscape/patches-5.4/701-net-0236-enetc-Replace-enetc_gregs-with-a-readers-writer-lock.patch | |
| parent | 0db9d118657dd93509abec817eb22ce13d0ec1b6 (diff) | |
| download | upstream-5d3a6fd970619dfc55f8259035c3027d7613a2a6.tar.gz upstream-5d3a6fd970619dfc55f8259035c3027d7613a2a6.tar.bz2 upstream-5d3a6fd970619dfc55f8259035c3027d7613a2a6.zip | |
kernel: bump 5.4 to 5.4.99
Ran update_kernel.sh in a fresh clone without any existing toolchains.
No manual changes needed.
Build system: x86_64
Build-tested: bcm27xx/bcm2711
Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/layerscape/patches-5.4/701-net-0236-enetc-Replace-enetc_gregs-with-a-readers-writer-lock.patch')
| -rw-r--r-- | target/linux/layerscape/patches-5.4/701-net-0236-enetc-Replace-enetc_gregs-with-a-readers-writer-lock.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/layerscape/patches-5.4/701-net-0236-enetc-Replace-enetc_gregs-with-a-readers-writer-lock.patch b/target/linux/layerscape/patches-5.4/701-net-0236-enetc-Replace-enetc_gregs-with-a-readers-writer-lock.patch index 7f78e1d043..262e87306a 100644 --- a/target/linux/layerscape/patches-5.4/701-net-0236-enetc-Replace-enetc_gregs-with-a-readers-writer-lock.patch +++ b/target/linux/layerscape/patches-5.4/701-net-0236-enetc-Replace-enetc_gregs-with-a-readers-writer-lock.patch @@ -259,7 +259,7 @@ Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com> --- a/drivers/net/ethernet/freescale/enetc/enetc_hw.h +++ b/drivers/net/ethernet/freescale/enetc/enetc_hw.h -@@ -329,7 +329,7 @@ struct enetc_hw { +@@ -331,7 +331,7 @@ struct enetc_hw { #define enetc_wr_reg(reg, val) enetc_wr_reg_wa((reg), (val)) /* accessors for data-path, due to MDIO issue on LS1028 these should be called @@ -268,7 +268,7 @@ Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com> */ #define enetc_rd_reg_hot(reg) ioread32((reg)) #define enetc_wr_reg_hot(reg, val) iowrite32((val), (reg)) -@@ -352,90 +352,45 @@ static inline u64 enetc_rd_reg64(void __ +@@ -354,90 +354,45 @@ static inline u64 enetc_rd_reg64(void __ } #endif @@ -371,7 +371,7 @@ Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com> #define enetc_rd(hw, off) enetc_rd_reg((hw)->reg + (off)) --- a/drivers/net/ethernet/freescale/enetc/enetc_pf.c +++ b/drivers/net/ethernet/freescale/enetc/enetc_pf.c -@@ -987,8 +987,9 @@ static void enetc_pf_remove(struct pci_d +@@ -1046,8 +1046,9 @@ static void enetc_pf_remove(struct pci_d enetc_pci_remove(pdev); } |