Messages in this thread | | | Date | Mon, 29 Apr 2013 11:35:40 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the vfs tree with the powerpc tree |
| |
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in arch/powerpc/kernel/rtas_flash.c between commit ad18a364f186 ("powerpc/rtas_flash: Free kmem upon module exit"), from the powerpc tree and commit 5c0333c00ff6 ("ppc: Clean up rtas_flash driver somewhat") from the vfs tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/powerpc/kernel/rtas_flash.c index a3e4034,8196bfb..0000000 --- a/arch/powerpc/kernel/rtas_flash.c +++ b/arch/powerpc/kernel/rtas_flash.c @@@ -806,20 -740,17 +758,22 @@@ enomem_buf static void __exit rtas_flash_cleanup(void) { + int i; + rtas_flash_term_hook = NULL; + if (rtas_firmware_flash_list) { + free_flash_list(rtas_firmware_flash_list); + rtas_firmware_flash_list = NULL; + } + - if (flash_block_cache) - kmem_cache_destroy(flash_block_cache); + for (i = 0; i < ARRAY_SIZE(rtas_flash_files); i++) { + const struct rtas_flash_file *f = &rtas_flash_files[i]; + remove_proc_entry(f->filename, NULL); + } - remove_flash_pde(firmware_flash_pde); - remove_flash_pde(firmware_update_pde); - remove_flash_pde(validate_pde); - remove_flash_pde(manage_pde); + kmem_cache_destroy(flash_block_cache); + kfree(rtas_validate_flash_data.buf); } module_init(rtas_flash_init); [unhandled content-type:application/pgp-signature] | |