The patch titled
Subject: kexec: fix the add restriction on the kexec_load
has been removed from the -mm tree. Its filename was
kexec-add-resriction-on-the-kexec_load-update.patch
This patch was dropped because an updated version will be merged
------------------------------------------------------
From: zhong jiang <zhongjiang@xxxxxxxxxx>
Subject: kexec: fix the add restriction on the kexec_load
Because segments size is in bytes, while totalram_pages is in pages
so we should fix it.
Link: http://lkml.kernel.org/r/579353BE.9010600@xxxxxxxxxx
Signed-off-by: zhong jiang <zhongjiang@xxxxxxxxxx>
Cc: Eric Biederman <ebiederm@xxxxxxxxxxxx>
Cc: Vivek Goyal <vgoyal@xxxxxxxxxx>
Cc: Dave Young <dyoung@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/kexec_core.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff -puN kernel/kexec_core.c~kexec-add-resriction-on-the-kexec_load-update kernel/kexec_core.c
--- a/kernel/kexec_core.c~kexec-add-resriction-on-the-kexec_load-update
+++ a/kernel/kexec_core.c
@@ -221,13 +221,13 @@ int sanity_check_segment_list(struct kim
* allocating pages, which can cause a soft lockup.
*/
for (i = 0; i < nr_segments; i++) {
- if (image->segment[i].memsz > (totalram_pages / 2))
+ if (image->segment[i].memsz > (totalram_pages << 12) / 2)
return -EINVAL;
total_segments += image->segment[i].memsz;
}
- if (total_segments > (totalram_pages / 2))
+ if (total_segments > (totalram_pages << 12) / 2)
return -EINVAL;
/*
_
Patches currently in -mm which might be from zhongjiang@xxxxxxxxxx are
mm-hugetlb-fix-race-when-migrate-pages.patch
mm-update-the-comment-in-__isolate_free_page.patch
mm-page_owner-align-with-pageblock_nr-pages.patch
mm-walk-the-zone-in-pageblock_nr_pages-steps.patch
kexec-add-restriction-on-kexec_load-segment-sizes.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
