The patch titled
pm: x86: remove obsolete PM definitions from NMI header
has been removed from the -mm tree. Its filename was
pm-x86-remove-obsolete-pm-definitions-from-nmi-header.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/
------------------------------------------------------
Subject: pm: x86: remove obsolete PM definitions from NMI header
From: Rafael J. Wysocki <rjw@xxxxxxx>
Remove obsolete and no longer used PM-related definitions from
include/asm-x86/nmi.h .
Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/asm-x86/nmi.h | 21 ---------------------
1 file changed, 21 deletions(-)
diff -puN include/asm-x86/nmi.h~pm-x86-remove-obsolete-pm-definitions-from-nmi-header include/asm-x86/nmi.h
--- a/include/asm-x86/nmi.h~pm-x86-remove-obsolete-pm-definitions-from-nmi-header
+++ a/include/asm-x86/nmi.h
@@ -15,27 +15,6 @@
*/
int do_nmi_callback(struct pt_regs *regs, int cpu);
-#ifdef CONFIG_PM
-
-/** Replace the PM callback routine for NMI. */
-struct pm_dev *set_nmi_pm_callback(pm_callback callback);
-
-/** Unset the PM callback routine back to the default. */
-void unset_nmi_pm_callback(struct pm_dev *dev);
-
-#else
-
-static inline struct pm_dev *set_nmi_pm_callback(pm_callback callback)
-{
- return 0;
-}
-
-static inline void unset_nmi_pm_callback(struct pm_dev *dev)
-{
-}
-
-#endif /* CONFIG_PM */
-
#ifdef CONFIG_X86_64
extern void default_do_nmi(struct pt_regs *);
#endif
_
Patches currently in -mm which might be from rjw@xxxxxxx are
linux-next.patch
pm-remove-references-to-struct-pm_dev-from-irda-headers.patch
swsusp-provide-users-with-a-hint-about-the-no_console_suspend-option.patch
swsusp-provide-users-with-a-hint-about-the-no_console_suspend-option-fix.patch
pm-boot-time-suspend-selftest.patch
pm-boot-time-suspend-selftest-vs-linux-next.patch
remove-include-linux-pm_legacyh.patch
pm-remove-definition-of-struct-pm_dev.patch
pm-remove-remaining-obsolete-definitions-from-pmh.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
