shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-03-25 12:00:22 +09:00
Code Issues Packages Projects Releases Wiki Activity

ANDROID: GKI: fix build error with mm/memory_hotplug.c and v5.15.144

Browse Source 
In the 5.15.144 release, commit d9a9d8effd ("memblock: allow to
specify flags with memblock_add_node()") changed the memblock_add_node()
parameters, which broke the android build due to out-of-tree changes in
mm/memory_hotplug.c.  Fix this all up by passing in the proper
parameters.

Fixes: d9a9d8effd ("memblock: allow to specify flags with memblock_add_node()")
Change-Id: I0d871bec82277823551c45cea23e970ff75c6238
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2024-01-03 16:21:03 +00:00
parent caae297a7b
commit 3355035c72
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mm/memory_hotplug.c
View File

@@ -1516,7 +1516,7 @@ int add_memory_subsection(int nid, u64 start, u64 size)
nid = memory_add_physaddr_to_nid(start);
if (IS_ENABLED(CONFIG_ARCH_KEEP_MEMBLOCK))
memblock_add_node(start, size, nid);
memblock_add_node(start, size, nid, MEMBLOCK_NONE);
ret = arch_add_memory(nid, start, size, &params);
if (ret) {