The patch titled pm: x86: remove obsolete PM definitions from NMI header has been added to the -mm tree. Its filename is pm-x86-remove-obsolete-pm-definitions-from-nmi-header.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://www.zip.com.au/~akpm/linux/patches/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: 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 x86-fix-lockdep-warning-during-suspend-to-ram.patch snapshot-push-bkl-down-into-ioctl-handlers.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 remove-include-linux-pm_legacyh.patch shrink_slab-handle-bad-shrinkers.patch pm-x86-remove-obsolete-pm-definitions-from-nmi-header.patch pm-remove-references-to-struct-pm_dev-from-irda-headers.patch pm-remove-definition-of-struct-pm_dev.patch pm-remove-obsolete-piece-of-pm-documentation.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