The patch titled sh: fix proc file removal for superh store queue module has been added to the -mm tree. Its filename is sh-fix-proc-file-removal-for-superh-store-queue-module.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: sh: fix proc file removal for superh store queue module From: Neil Horman <nhorman@xxxxxxxxxxxxx> Clean up proc file removal in sq module for superh arch. currently on a failed module load or on module unload a proc file is left registered which can cause a random memory execution or oopses if read after unload. This patch cleans up that deregistration. Signed-off-by: Neil Horman <nhorman@xxxxxxxxxxxxx> Cc: Paul Mundt <lethal@xxxxxxxxxxxx> Cc: Kazumoto Kojima <kkojima@xxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- diff -puN arch/sh/kernel/cpu/sh4/sq.c~sh-fix-proc-file-removal-for-superh-store-queue-module arch/sh/kernel/cpu/sh4/sq.c --- a/arch/sh/kernel/cpu/sh4/sq.c~sh-fix-proc-file-removal-for-superh-store-queue-module +++ a/arch/sh/kernel/cpu/sh4/sq.c @@ -421,18 +421,22 @@ static struct miscdevice sq_dev = { static int __init sq_api_init(void) { + int ret; printk(KERN_NOTICE "sq: Registering store queue API.\n"); -#ifdef CONFIG_PROC_FS create_proc_read_entry("sq_mapping", 0, 0, sq_mapping_read_proc, 0); -#endif - return misc_register(&sq_dev); + ret = misc_register(&sq_dev); + if (ret) + remove_proc_entry("sq_mapping", NULL); + + return ret; } static void __exit sq_api_exit(void) { misc_deregister(&sq_dev); + remove_proc_entry("sq_mapping", NULL); } module_init(sq_api_init); _ Patches currently in -mm which might be from nhorman@xxxxxxxxxxxxx are sh-fix-proc-file-removal-for-superh-store-queue-module.patch apm-clean-up-module-initalization.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