The patch titled pm: rework includes, remove arch ifdefs has been added to the -mm tree. Its filename is pm-rework-includes-remove-arch-ifdefs.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: pm: rework includes, remove arch ifdefs From: Magnus Damm <damm@xxxxxxxxxx> Make the following header file changes: - remove arch ifdefs and asm/suspend.h from linux/suspend.h - add asm/suspend.h to disk.c (for arch_prepare_suspend()) - add linux/io.h to swsusp.c (for ioremap()) These are the only generic changes needed to get CONFIG_HIBERNATION working on SuperH. Signed-off-by: Magnus Damm <damm@xxxxxxxxxx> Cc: Paul Mundt <lethal@xxxxxxxxxxxx> Cc: "Rafael J. Wysocki" <rjw@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/suspend.h | 3 --- kernel/power/disk.c | 1 + kernel/power/swsusp.c | 1 + 3 files changed, 2 insertions(+), 3 deletions(-) diff -puN include/linux/suspend.h~pm-rework-includes-remove-arch-ifdefs include/linux/suspend.h --- a/include/linux/suspend.h~pm-rework-includes-remove-arch-ifdefs +++ a/include/linux/suspend.h @@ -1,9 +1,6 @@ #ifndef _LINUX_SUSPEND_H #define _LINUX_SUSPEND_H -#if defined(CONFIG_X86) || defined(CONFIG_FRV) || defined(CONFIG_PPC32) || defined(CONFIG_PPC64) -#include <asm/suspend.h> -#endif #include <linux/swap.h> #include <linux/notifier.h> #include <linux/init.h> diff -puN kernel/power/disk.c~pm-rework-includes-remove-arch-ifdefs kernel/power/disk.c --- a/kernel/power/disk.c~pm-rework-includes-remove-arch-ifdefs +++ a/kernel/power/disk.c @@ -22,6 +22,7 @@ #include <linux/console.h> #include <linux/cpu.h> #include <linux/freezer.h> +#include <asm/suspend.h> #include "power.h" diff -puN kernel/power/swsusp.c~pm-rework-includes-remove-arch-ifdefs kernel/power/swsusp.c --- a/kernel/power/swsusp.c~pm-rework-includes-remove-arch-ifdefs +++ a/kernel/power/swsusp.c @@ -51,6 +51,7 @@ #include <linux/highmem.h> #include <linux/time.h> #include <linux/rbtree.h> +#include <linux/io.h> #include "power.h" _ Patches currently in -mm which might be from damm@xxxxxxxxxx are linux-next.patch early-platform-driver-v3.patch clocksource-pass-clocksource-to-read-callback.patch clocksource-add-enable-and-disable-callbacks.patch irq-free-setup_irq-interrupt-using-free_irq.patch pm-rework-includes-remove-arch-ifdefs.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