diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2026-06-27 11:06:50 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2026-06-27 11:06:50 +0100 |
| commit | f657f1a475c7ab8aa116fd7bc8a6dba693d379ae (patch) | |
| tree | a78e9483a0442006a01d667fd016898f6dfadd73 /drivers/base | |
| parent | 962d275461ceb4a7e588a46067437acfaebb6377 (diff) | |
| parent | 0c503cf3dde2e53614f05261ece12f9d3d4c3c20 (diff) | |
Merge v6.18.37linux-rolling-lts
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/memory.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/base/memory.c b/drivers/base/memory.c index 0ecb43556736..fdbec49f5f5b 100644 --- a/drivers/base/memory.c +++ b/drivers/base/memory.c @@ -828,7 +828,6 @@ static int add_memory_block(unsigned long block_id, int nid, unsigned long state mem->start_section_nr = block_id * sections_per_block; mem->state = state; mem->nid = nid; - mem->altmap = altmap; INIT_LIST_HEAD(&mem->group_next); #ifndef CONFIG_NUMA @@ -846,6 +845,8 @@ static int add_memory_block(unsigned long block_id, int nid, unsigned long state if (ret) return ret; + mem->altmap = altmap; + if (group) { mem->group = group; list_add(&mem->group_next, &group->memory_blocks); |