diff options
| author | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2021-03-18 10:27:50 +0000 |
|---|---|---|
| committer | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2021-03-18 10:27:50 +0000 |
| commit | 960eed45f6d39b19da2ad2e3a075da9553103567 (patch) | |
| tree | 53e446badb43a68e37b16fc72b045fe8c850eee8 /arch/arm64/kernel | |
| parent | 1c320bdc60474c21bc5a3050fde3fa849ee31f45 (diff) | |
| parent | 0437de26e28dd844f51fde7a749a82cb2d3694ad (diff) | |
Merge tag 'v5.4.106' into 5.4-2.3.x-imx
This is the 5.4.106 stable release
Following conflicts were resolved during merge:
----
- drivers/net/can/flexcan.c:
Merge NXP commit c2aba4909dc1c ("MLK-23225-2 can: flexcan: initialize all
flexcan memory for ECC function") with upstream commit fd872e63b274e ("can:
flexcan: invoke flexcan_chip_freeze() to enter freeze mode").
- drivers/net/ethernet/freescale/enetc/enetc_pf.c:
Merge upstream commit a8ecf0b2d9547 ("net: enetc: initialize RFS/RSS memories
for unused ports too") with NXP commits 7a5abf6a724f9 ("enetc: Remove mdio bus
on PF probe error path") and 501d929c03cfa ("enetc: Use DT protocol information
to set up the ports")
----
Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
Diffstat (limited to 'arch/arm64/kernel')
| -rw-r--r-- | arch/arm64/kernel/head.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S index 438de2301cfe..a2e0b3754943 100644 --- a/arch/arm64/kernel/head.S +++ b/arch/arm64/kernel/head.S @@ -337,7 +337,7 @@ __create_page_tables: */ adrp x5, __idmap_text_end clz x5, x5 - cmp x5, TCR_T0SZ(VA_BITS) // default T0SZ small enough? + cmp x5, TCR_T0SZ(VA_BITS_MIN) // default T0SZ small enough? b.ge 1f // .. then skip VA range extension adr_l x6, idmap_t0sz |