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 /kernel/crash_reserve.c | |
| parent | 2dce993165088dbe728faa21547e3b74213b6732 (diff) | |
| parent | 67784a74e258a467225f0e68335df77acd67b7ab (diff) | |
Merge branch 'linus' into smp/core
Pull in upstream changes so further patches don't conflict.
Diffstat (limited to 'kernel/crash_reserve.c')
| -rw-r--r-- | kernel/crash_reserve.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/crash_reserve.c b/kernel/crash_reserve.c index d3b4cd12bdd13..64d44a52c0114 100644 --- a/kernel/crash_reserve.c +++ b/kernel/crash_reserve.c @@ -423,7 +423,8 @@ retry: if (high && search_end == CRASH_ADDR_HIGH_MAX) { search_end = CRASH_ADDR_LOW_MAX; search_base = 0; - goto retry; + if (search_end != CRASH_ADDR_HIGH_MAX) + goto retry; } pr_warn("cannot allocate crashkernel (size:0x%llx)\n", crash_size); |