projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[deliverable/linux.git]
/
init
/
main.c
diff --git
a/init/main.c
b/init/main.c
index 8dc93df20f7fdb7fe100fd7bbd578e86773afad8..b3c6e363ae181b01fb5e530c2ae9b733c59c4ba4 100644
(file)
--- a/
init/main.c
+++ b/
init/main.c
@@
-705,7
+705,6
@@
static int __init initcall_blacklist(char *str)
static bool __init_or_module initcall_blacklisted(initcall_t fn)
{
static bool __init_or_module initcall_blacklisted(initcall_t fn)
{
- struct list_head *tmp;
struct blacklist_entry *entry;
char *fn_name;
struct blacklist_entry *entry;
char *fn_name;
@@
-713,8
+712,7
@@
static bool __init_or_module initcall_blacklisted(initcall_t fn)
if (!fn_name)
return false;
if (!fn_name)
return false;
- list_for_each(tmp, &blacklisted_initcalls) {
- entry = list_entry(tmp, struct blacklist_entry, next);
+ list_for_each_entry(entry, &blacklisted_initcalls, next) {
if (!strcmp(fn_name, entry->buf)) {
pr_debug("initcall %s blacklisted\n", fn_name);
kfree(fn_name);
if (!strcmp(fn_name, entry->buf)) {
pr_debug("initcall %s blacklisted\n", fn_name);
kfree(fn_name);
This page took
0.023796 seconds
and
5
git commands to generate.