The patch titled PM: Make suspend_ops static has been added to the -mm tree. Its filename is pm-make-suspend_ops-static.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: PM: Make suspend_ops static From: Rafael J. Wysocki <rjw@xxxxxxx> The variable suspend_ops representing the set of global platform-specific suspend-related operations, used by the PM core, need not be exported outside of kernel/power/main.c . Make it static. Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx> Acked-by: Pavel Machek <pavel@xxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/suspend.h | 2 -- kernel/power/main.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff -puN include/linux/suspend.h~pm-make-suspend_ops-static include/linux/suspend.h --- a/include/linux/suspend.h~pm-make-suspend_ops-static +++ a/include/linux/suspend.h @@ -77,8 +77,6 @@ struct platform_suspend_ops { void (*finish)(void); }; -extern struct platform_suspend_ops *suspend_ops; - #ifdef CONFIG_PM /** * suspend_set_ops - set platform dependent suspend operations diff -puN kernel/power/main.c~pm-make-suspend_ops-static kernel/power/main.c --- a/kernel/power/main.c~pm-make-suspend_ops-static +++ a/kernel/power/main.c @@ -30,7 +30,7 @@ BLOCKING_NOTIFIER_HEAD(pm_chain_head); DEFINE_MUTEX(pm_mutex); -struct platform_suspend_ops *suspend_ops; +static struct platform_suspend_ops *suspend_ops; /** * suspend_set_ops - Set the global suspend method table. _ Patches currently in -mm which might be from rjw@xxxxxxx are origin.patch x86_64-pm_trace-support.patch i386-do-not-restore-reserved-memory-after-hibernation.patch freezer-run-show_state-when-freezing-times-out.patch pm-do-not-require-dev-spew-to-get-pm_debug.patch swsusp-remove-incorrect-code-from-userc.patch swsusp-remove-code-duplication-between-diskc-and-userc.patch swsusp-introduce-restore-platform-operations.patch swsusp-fix-hibernation-code-ordering.patch hibernation-prepare-to-enter-the-low-power-state.patch freezer-avoid-freezing-kernel-threads-prematurely.patch freezer-use-__set_current_state-in-refrigerator.patch freezer-return-int-from-freeze_processes.patch freezer-remove-redundant-check-in-try_to_freeze_tasks.patch pm-introduce-hibernation-and-suspend-notifiers.patch pm-disable-usermode-helper-before-hibernation-and-suspend.patch pm-prevent-frozen-user-mode-helpers-from-failing-the-freezing-of-tasks-rev-2.patch pm-reduce-code-duplication-between-mainc-and-userc-updated.patch acpi-do-not-prepare-for-hibernation-in-acpi_shutdown.patch pm-introduce-pm_power_off_prepare.patch pm-optional-beeping-during-resume-from-suspend-to-ram.patch pm-integrate-beeping-flag-with-existing-acpi_sleep-flags.patch pm-remove-deprecated-sysfs-files.patch pm-remove-deprecated-dpm_runtime_-routines.patch suspend-maintainers-update.patch acpi-implement-the-set_target-callback-from-pm_ops.patch acpi-add-acpi_pm_device_sleep_state-helper-routine.patch pm-move-definition-of-struct-pm_ops-to-suspendh.patch pm-rename-struct-pm_ops-and-related-things.patch pm-rework-struct-platform_suspend_ops.patch pm-fix-compilation-of-suspend-code-if-config_pm-is-unset.patch pm-make-suspend_ops-static.patch pm-rework-struct-hibernation_ops.patch pm-rename-hibernation_ops-to-platform_hibernation_ops.patch shrink_slab-handle-bad-shrinkers.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