The patch titled ramoops-use-the-platform-data-structure-instead-of-module-params-fix has been added to the -mm tree. Its filename is ramoops-use-the-platform-data-structure-instead-of-module-params-fix.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: ramoops-use-the-platform-data-structure-instead-of-module-params-fix From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> drivers/char/ramoops.c:165: warning: initialization from incompatible pointer type well that wasn't very well tested. Cc: Kyungmin Park <kyungmin.park@xxxxxxxxxxx> Cc: Marco Stornelli <marco.stornelli@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/char/ramoops.c | 3 ++- linux/ramoops.h | 0 2 files changed, 2 insertions(+), 1 deletion(-) diff -puN drivers/char/ramoops.c~ramoops-use-the-platform-data-structure-instead-of-module-params-fix drivers/char/ramoops.c --- a/drivers/char/ramoops.c~ramoops-use-the-platform-data-structure-instead-of-module-params-fix +++ a/drivers/char/ramoops.c @@ -150,7 +150,7 @@ fail3: return err; } -static void __exit ramoops_remove(void) +static int __exit ramoops_remove(struct platform_device *pdev) { struct ramoops_context *cxt = &oops_cxt; @@ -159,6 +159,7 @@ static void __exit ramoops_remove(void) iounmap(cxt->virt_addr); release_mem_region(cxt->phys_addr, cxt->size); + return 0; } static struct platform_driver ramoops_driver = { diff -puN include/linux/ramoops.h~ramoops-use-the-platform-data-structure-instead-of-module-params-fix include/linux/ramoops.h _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch linux-next.patch next-remove-localversion.patch fs-inodec-work-around-bug.patch drivers-pnp-isapnp-procc-fix-build.patch i-need-old-gcc.patch efifb-support-the-efi-framebuffer-on-more-apple-hardware-checkpatch-fixes.patch mm-vmap-area-cache.patch acpi-apei-fix-erst-move_data-instruction-implementation.patch arch-x86-kernel-entry_64s-fix-build-with-gas-2161.patch arch-x86-kernel-entry_32s-i386-too.patch parport-prevent-arm-boards-frmo-crashing-when-cups-is-loaded-fix.patch gcc-46-btrfs-clean-up-unused-variables-bugs.patch drivers-gpu-drm-radeon-atomc-fix-warning.patch fs-notify-fanotify-fanotify_userc-fix-warnings.patch hpet-factor-timer-allocate-from-open.patch leds-route-kbd-leds-through-the-generic-leds-layer.patch sctp-prevent-reading-out-of-bounds-memory-cleanup.patch drivers-net-tulip-de4x5c-fix-copy-length-in-de4x5_ioctl-checkpatch-fixes.patch serial-add-sc16is7x2-driver-update-fix.patch security-add-const-to-security_task_setscheduler.patch sched-make-sched_param-argument-static-variables-in-some-sched_setscheduler-caller.patch drivers-message-fusion-mptsasc-fix-warning.patch usb-storage-add-new-no_read_disc_info-quirk-fix.patch mm.patch oom-kill-all-threads-sharing-oom-killed-tasks-mm-fix.patch oom-kill-all-threads-sharing-oom-killed-tasks-mm-fix-fix.patch oom-rewrite-error-handling-for-oom_adj-and-oom_score_adj-tunables.patch oom-fix-locking-for-oom_adj-and-oom_score_adj.patch mm-only-build-per-node-scan_unevictable-functions-when-numa-is-enabled-cleanup.patch memory-hotplug-unify-is_removable-and-offline-detection-code-checkpatch-fixes.patch frv-duplicate-output_buffer-of-e03-checkpatch-fixes.patch kernelh-add-minmax3-macros-fix.patch include-linux-kernelh-add-__must_check-to-strict_strto.patch scripts-get_maintainerpl-add-git-blame-rolestats-authored-lines-information.patch mmc_test-move-files-from-sysfs-to-debugfs-checkpatch-fixes.patch mmc-move-regulator-handling-closer-to-core-v3-fix.patch sdhci-get-rid-of-card-detect-work-fix.patch checkpatch-returning-errno-typically-should-be-negative.patch select-rename-estimate_accuracy-to-select_estimate_accuracy.patch cgroup_freezer-update_freezer_state-does-incorrect-state-transitions-checkpatch-fixes.patch core_pattern-fix-long-parameters-was-truncated-by-core_pattern-handler-update.patch core_pattern-fix-long-parameters-was-truncated-by-core_pattern-handler-update-2.patch core_pattern-fix-long-parameters-was-truncated-by-core_pattern-handler-update-2-checkpatch-fixes.patch drivers-char-hvc_consolec-remove-unneeded-__set_current_statetask_running.patch delay-accounting-re-implement-c-for-getdelaysc-to-report-information-on-a-target-command-checkpatch-fixes.patch pps-add-async-pps-event-handler-fix.patch memstick-add-driver-for-ricoh-r5c592-card-reader-cleanups.patch kernel-resourcec-handle-reinsertion-of-an-already-inserted-resource.patch ramoops-use-the-platform-data-structure-instead-of-module-params-fix.patch vfs-add-super-operation-writeback_inodes-fix.patch reiser4-export-remove_from_page_cache-fix.patch reiser4-export-find_get_pages.patch reiser4.patch reiser4-writeback_inodes-implementation-fix.patch reiser4-fixups.patch reiser4-broke.patch journal_add_journal_head-debug.patch slab-leaks3-default-y.patch put_bh-debug.patch getblk-handle-2tb-devices.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