init/main.c: return 1 from handled __setup() functions

[mirror_ubuntu-jammy-kernel.git] / init / main.c

diff --git a/init/main.c b/init/main.c
index 28159b210f96097748b6ba149628204045b201ea..dec941672159fdb3e85fd10e6984d64922229922 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -1198,7 +1198,7 @@ static int __init initcall_blacklist(char *str)
                }
        } while (str_entry);
 
-       return 0;
+       return 1;
 }
 
 static bool __init_or_module initcall_blacklisted(initcall_t fn)
@@ -1460,7 +1460,9 @@ static noinline void __init kernel_init_freeable(void);
 bool rodata_enabled __ro_after_init = true;
 static int __init set_debug_rodata(char *str)
 {
-       return strtobool(str, &rodata_enabled);
+       if (strtobool(str, &rodata_enabled))
+               pr_warn("Invalid option string for rodata: '%s'\n", str);
+       return 1;
 }
 __setup("rodata=", set_debug_rodata);
 #endif