The patch titled Subject: ramoops: update parameters only after successful init has been removed from the -mm tree. Its filename was ramoops-update-parameters-only-after-successful-init.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ From: Kees Cook <kees@xxxxxxxxxxx> Subject: ramoops: update parameters only after successful init If a platform device exists on the system, but ramoops fails to attach to it, the module parameters are overridden before ramoops can fall back and try to use passed module parameters. Move update to end of init routine. Signed-off-by: Kees Cook <keescook@xxxxxxxxxxxx> Cc: Marco Stornelli <marco.stornelli@xxxxxxxxx> Cc: Sergiu Iordache <sergiu@xxxxxxxxxxxx> Cc: Seiji Aguchi <seiji.aguchi@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/char/ramoops.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff -puN drivers/char/ramoops.c~ramoops-update-parameters-only-after-successful-init drivers/char/ramoops.c --- a/drivers/char/ramoops.c~ramoops-update-parameters-only-after-successful-init +++ a/drivers/char/ramoops.c @@ -147,14 +147,6 @@ static int __init ramoops_probe(struct p cxt->phys_addr = pdata->mem_address; cxt->record_size = pdata->record_size; cxt->dump_oops = pdata->dump_oops; - /* - * Update the module parameter variables as well so they are visible - * through /sys/module/ramoops/parameters/ - */ - mem_size = pdata->mem_size; - mem_address = pdata->mem_address; - record_size = pdata->record_size; - dump_oops = pdata->dump_oops; if (!request_mem_region(cxt->phys_addr, cxt->size, "ramoops")) { pr_err("request mem region failed\n"); @@ -175,6 +167,15 @@ static int __init ramoops_probe(struct p goto fail1; } + /* + * Update the module parameter variables as well so they are visible + * through /sys/module/ramoops/parameters/ + */ + mem_size = pdata->mem_size; + mem_address = pdata->mem_address; + record_size = pdata->record_size; + dump_oops = pdata->dump_oops; + return 0; fail1: _ Patches currently in -mm which might be from kees@xxxxxxxxxxx are origin.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