mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git
synced 2026-04-18 11:33:36 -04:00
Merge branch 'mm-hotfixes-stable' into mm-stable in order to merge
"mm/huge_memory: only get folio_order() once during __folio_split()" into mm-stable.
This commit is contained in:
@@ -1758,10 +1758,15 @@ int main(int argc, char *argv[])
|
||||
uffd_test_ops = mem_type->mem_ops;
|
||||
uffd_test_case_ops = test->test_case_ops;
|
||||
|
||||
if (mem_type->mem_flag & (MEM_HUGETLB_PRIVATE | MEM_HUGETLB))
|
||||
if (mem_type->mem_flag & (MEM_HUGETLB_PRIVATE | MEM_HUGETLB)) {
|
||||
gopts.page_size = default_huge_page_size();
|
||||
else
|
||||
if (gopts.page_size == 0) {
|
||||
uffd_test_skip("huge page size is 0, feature missing?");
|
||||
continue;
|
||||
}
|
||||
} else {
|
||||
gopts.page_size = psize();
|
||||
}
|
||||
|
||||
/* Ensure we have at least 2 pages */
|
||||
gopts.nr_pages = MAX(UFFD_TEST_MEM_SIZE, gopts.page_size * 2)
|
||||
@@ -1776,12 +1781,6 @@ int main(int argc, char *argv[])
|
||||
continue;
|
||||
|
||||
uffd_test_start("%s on %s", test->name, mem_type->name);
|
||||
if ((mem_type->mem_flag == MEM_HUGETLB ||
|
||||
mem_type->mem_flag == MEM_HUGETLB_PRIVATE) &&
|
||||
(default_huge_page_size() == 0)) {
|
||||
uffd_test_skip("huge page size is 0, feature missing?");
|
||||
continue;
|
||||
}
|
||||
if (!uffd_feature_supported(test)) {
|
||||
uffd_test_skip("feature missing");
|
||||
continue;
|
||||
|
||||
Reference in New Issue
Block a user