Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2d6aa8f authored by Baoquan He's avatar Baoquan He Committed by Linus Torvalds
Browse files

kexec: check if crashk_res_low exists when exclude it from crash mem ranges 



Add a check if crashk_res_low exists just like GART region does.  If
crashk_res_low doesn't exist, calling exclude_mem_range is unnecessary.

Meanwhile, since crashk_res_low has been initialized at definition, it's
safe just use "if (crashk_low_res.end)" to check if it's exist.  And this
can make it consistent with other places of check.

Signed-off-by: default avatarBaoquan He <bhe@redhat.com>
Acked-by: default avatarVivek Goyal <vgoyal@redhat.com>
Cc: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 669280a1

arch/x86/kernel/crash.c

+6 −4
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ static void fill_up_crash_elf_data(struct crash_elf_data *ced, 
	ced->max_nr_ranges++;



	/* If crashk_low_res is not 0, another range split possible */

	if (crashk_low_res.end != 0)

	if (crashk_low_res.end)

		ced->max_nr_ranges++;

}
@@ -335,9 +335,11 @@ static int elf_header_exclude_ranges(struct crash_elf_data *ced, 
	if (ret)

		return ret;



	if (crashk_low_res.end) {

		ret = exclude_mem_range(cmem, crashk_low_res.start, crashk_low_res.end);

		if (ret)

			return ret;

	}



	/* Exclude GART region */

	if (ced->gart_end) {