aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/kexec_core.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/kexec_core.c')
-rw-r--r--kernel/kexec_core.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/kernel/kexec_core.c b/kernel/kexec_core.c
index 561675589511..5617cc412444 100644
--- a/kernel/kexec_core.c
+++ b/kernel/kexec_core.c
@@ -441,6 +441,8 @@ static struct page *kimage_alloc_crash_control_pages(struct kimage *image,
441 while (hole_end <= crashk_res.end) { 441 while (hole_end <= crashk_res.end) {
442 unsigned long i; 442 unsigned long i;
443 443
444 cond_resched();
445
444 if (hole_end > KEXEC_CRASH_CONTROL_MEMORY_LIMIT) 446 if (hole_end > KEXEC_CRASH_CONTROL_MEMORY_LIMIT)
445 break; 447 break;
446 /* See if I overlap any of the segments */ 448 /* See if I overlap any of the segments */
@@ -1467,9 +1469,6 @@ static int __init crash_save_vmcoreinfo_init(void)
1467#endif 1469#endif
1468 VMCOREINFO_NUMBER(PG_head_mask); 1470 VMCOREINFO_NUMBER(PG_head_mask);
1469 VMCOREINFO_NUMBER(PAGE_BUDDY_MAPCOUNT_VALUE); 1471 VMCOREINFO_NUMBER(PAGE_BUDDY_MAPCOUNT_VALUE);
1470#ifdef CONFIG_X86
1471 VMCOREINFO_NUMBER(KERNEL_IMAGE_SIZE);
1472#endif
1473#ifdef CONFIG_HUGETLB_PAGE 1472#ifdef CONFIG_HUGETLB_PAGE
1474 VMCOREINFO_NUMBER(HUGETLB_PAGE_DTOR); 1473 VMCOREINFO_NUMBER(HUGETLB_PAGE_DTOR);
1475#endif 1474#endif