Merge branch 'for-5.17/kallsyms' into for-linus

pmladek · pmladek · commit b2dfc3fe73b5 · 2022-01-14T13:36:32.000+01:00
diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
@@ -223,6 +223,7 @@ int kallsyms_on_each_symbol(int (*fn)(void *, const char *, struct module *,
 		ret = fn(data, namebuf, NULL, kallsyms_sym_address(i));
 		if (ret != 0)
 			return ret;
+		cond_resched();
 	}
 	return 0;
 }
diff --git a/kernel/module.c b/kernel/module.c
@@ -4462,6 +4462,8 @@ int module_kallsyms_on_each_symbol(int (*fn)(void *, const char *,
 				 mod, kallsyms_symbol_value(sym));
 			if (ret != 0)
 				goto out;
+
+			cond_resched();
 		}
 	}
 out:

Original file line number	Diff line number	Diff line change
`@@ -223,6 +223,7 @@ int kallsyms_on_each_symbol(int (fn)(void , const char , struct module ,`
`223`	`223`	`ret = fn(data, namebuf, NULL, kallsyms_sym_address(i));`
`224`	`224`	`if (ret != 0)`
`225`	`225`	`return ret;`
	`226`	`+ cond_resched();`
`226`	`227`	`}`
`227`	`228`	`return 0;`
`228`	`229`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4462,6 +4462,8 @@ int module_kallsyms_on_each_symbol(int (fn)(void , const char *,`
`4462`	`4462`	`mod, kallsyms_symbol_value(sym));`
`4463`	`4463`	`if (ret != 0)`
`4464`	`4464`	`goto out;`
	`4465`	`+`
	`4466`	`+ cond_resched();`
`4465`	`4467`	`}`
`4466`	`4468`	`}`
`4467`	`4469`	`out:`