diff options
| author |   Thomas Gleixner <tglx@linutronix.de> | 2024-09-04 12:15:38 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2024-09-04 12:15:38 +0200 |
| commit | eb876ea724835126f215c9a5bcc9e6148e2a6d15 (patch) | |
| tree | 689c215270b023c2f94a6629c7f1d3ef8e49c28a /mm/memory_hotplug.c | |
| parent | cpu/hotplug: Provide weak fallback for arch_cpuhp_init_parallel_bringup() (diff) | |
| parent | Merge tag 'ata-6.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux (diff) | |
| download | wireguard-linux-eb876ea724835126f215c9a5bcc9e6148e2a6d15.tar.xz wireguard-linux-eb876ea724835126f215c9a5bcc9e6148e2a6d15.zip | |
Merge branch 'linus' into smp/core
Pull in upstream changes so further patches don't conflict.
Diffstat (limited to 'mm/memory_hotplug.c')
| -rw-r--r-- | mm/memory_hotplug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 66267c26ca1b..951878ab627a 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1681,7 +1681,7 @@ struct range __weak arch_get_mappable_range(void) struct range mhp_get_pluggable_range(bool need_mapping) { - const u64 max_phys = (1ULL << MAX_PHYSMEM_BITS) - 1; + const u64 max_phys = PHYSMEM_END; struct range mhp_range; if (need_mapping) { |