diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2022-03-04 20:25:09 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-03-05 22:57:45 +0000 |
commit | da19366b44af8521b0f311581793fc89d554cd40 (patch) | |
tree | d58d3834254b176725e3b60fa6c257c9efc0c6c9 /meta/recipes-kernel/linux/linux-yocto_5.15.bb | |
parent | 16873202f4fc9409b3b853ad2275c1068eb16ecd (diff) | |
download | openembedded-core-contrib-da19366b44af8521b0f311581793fc89d554cd40.tar.gz |
linux-yocto/5.15: riscv64: drop MAXPHYSMEM_128GB
Integrating the following commit(s) to linux-yocto:
commit e1b976ee4fb5af517cf01a9f2dd4a32f560ca894
Author: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Tue Feb 15 23:27:31 2022 -0500
riscv64: drop MAXPHYSMEM_128GB
The MAXPHYSMEM config options have been removed upstream via the
following commit, so we drop our setting.
commit 6250ecf5ba42292b652cd01c9fcb2239010c5c44
Author: Alexandre Ghiti <alexandre.ghiti@canonical.com>
Date: Mon Jan 17 10:57:16 2022 +0100
riscv: Get rid of MAXPHYSMEM configs
commit db1503d355a79d1d4255a9996f20e72848b74a56 upstream.
CONFIG_MAXPHYSMEM_* are actually never used, even the nommu defconfigs
selecting the MAXPHYSMEM_2GB had no effects on PAGE_OFFSET since it was
preempted by !MMU case right before.
In addition, the move of the kernel mapping at the end of the address
space broke the use of MAXPHYSMEM_2G with MMU since it defines PAGE_OFFSET
at the same address as the kernel mapping.
Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Fixes: 2bfc6cd81bd1 ("riscv: Move kernel mapping outside of linear mapping")
Signed-off-by: Alexandre Ghiti <alexandre.ghiti@canonical.com>
Tested-by: Geert Uytterhoeven <geert@linux-m68k.org>
Tested-by: Conor Dooley <Conor.Dooley@microchip.com>
Cc: stable@vger.kernel.org
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/linux/linux-yocto_5.15.bb')
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_5.15.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.15.bb b/meta/recipes-kernel/linux/linux-yocto_5.15.bb index 4b5e332c37..43409fb45e 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.15.bb @@ -23,7 +23,7 @@ SRCREV_machine:qemux86 ?= "7f685244afb3acd13e94968312580b63d7296705" SRCREV_machine:qemux86-64 ?= "7f685244afb3acd13e94968312580b63d7296705" SRCREV_machine:qemumips64 ?= "1d269d782d6b6effed2437ad6b11ae4f4e789259" SRCREV_machine ?= "7f685244afb3acd13e94968312580b63d7296705" -SRCREV_meta ?= "2d38a472b21ae343707c8bd64ac68a9eaca066a0" +SRCREV_meta ?= "e1b976ee4fb5af517cf01a9f2dd4a32f560ca894" # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll # get the <version>/base branch, which is pure upstream -stable, and the same |