[merged] pm-rework-includes-remove-arch-ifdefs-v2.patch removed from -mm tree

[merged] pm-rework-includes-remove-arch-ifdefs-v2.patch removed from -mm tree

[akpm]

The patch titled
     pm: rework includes, remove arch ifdefs
has been removed from the -mm tree.  Its filename was
     pm-rework-includes-remove-arch-ifdefs-v2.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: rework includes, remove arch ifdefs
From: Magnus Damm <damm@igel.co.jp>

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())
 - x86 32/64 bit compile fixes

Signed-off-by: Magnus Damm <damm@igel.co.jp>
Cc: Paul Mundt <lethal@linux-sh.org>
Acked-by: "Rafael J. Wysocki" <rjw@sisk.pl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/x86/kernel/asm-offsets_32.c |    1 +
 arch/x86/kernel/asm-offsets_64.c |    1 +
 arch/x86/power/cpu_32.c          |    1 +
 arch/x86/power/cpu_64.c          |    1 +
 arch/x86/power/hibernate_64.c    |    1 +
 include/linux/suspend.h          |    3 ---
 kernel/power/disk.c              |    1 +
 kernel/power/swsusp.c            |    1 +
 8 files changed, 7 insertions(+), 3 deletions(-)

diff -puN arch/x86/kernel/asm-offsets_32.c~pm-rework-includes-remove-arch-ifdefs-v2 arch/x86/kernel/asm-offsets_32.c
--- a/arch/x86/kernel/asm-offsets_32.c~pm-rework-includes-remove-arch-ifdefs-v2
+++ a/arch/x86/kernel/asm-offsets_32.c
@@ -18,6 +18,7 @@
 #include <asm/thread_info.h>
 #include <asm/bootparam.h>
 #include <asm/elf.h>
+#include <asm/suspend.h>
 
 #include <xen/interface/xen.h>
 
diff -puN arch/x86/kernel/asm-offsets_64.c~pm-rework-includes-remove-arch-ifdefs-v2 arch/x86/kernel/asm-offsets_64.c
--- a/arch/x86/kernel/asm-offsets_64.c~pm-rework-includes-remove-arch-ifdefs-v2
+++ a/arch/x86/kernel/asm-offsets_64.c
@@ -16,6 +16,7 @@
 #include <asm/thread_info.h>
 #include <asm/ia32.h>
 #include <asm/bootparam.h>
+#include <asm/suspend.h>
 
 #include <xen/interface/xen.h>
 
diff -puN arch/x86/power/cpu_32.c~pm-rework-includes-remove-arch-ifdefs-v2 arch/x86/power/cpu_32.c
--- a/arch/x86/power/cpu_32.c~pm-rework-includes-remove-arch-ifdefs-v2
+++ a/arch/x86/power/cpu_32.c
@@ -12,6 +12,7 @@
 #include <asm/mtrr.h>
 #include <asm/mce.h>
 #include <asm/xcr.h>
+#include <asm/suspend.h>
 
 static struct saved_context saved_context;
 
diff -puN arch/x86/power/cpu_64.c~pm-rework-includes-remove-arch-ifdefs-v2 arch/x86/power/cpu_64.c
--- a/arch/x86/power/cpu_64.c~pm-rework-includes-remove-arch-ifdefs-v2
+++ a/arch/x86/power/cpu_64.c
@@ -15,6 +15,7 @@
 #include <asm/pgtable.h>
 #include <asm/mtrr.h>
 #include <asm/xcr.h>
+#include <asm/suspend.h>
 
 static void fix_processor_context(void);
 
diff -puN arch/x86/power/hibernate_64.c~pm-rework-includes-remove-arch-ifdefs-v2 arch/x86/power/hibernate_64.c
--- a/arch/x86/power/hibernate_64.c~pm-rework-includes-remove-arch-ifdefs-v2
+++ a/arch/x86/power/hibernate_64.c
@@ -14,6 +14,7 @@
 #include <asm/page.h>
 #include <asm/pgtable.h>
 #include <asm/mtrr.h>
+#include <asm/suspend.h>
 
 /* References to section boundaries */
 extern const void __nosave_begin, __nosave_end;
diff -puN include/linux/suspend.h~pm-rework-includes-remove-arch-ifdefs-v2 include/linux/suspend.h
--- a/include/linux/suspend.h~pm-rework-includes-remove-arch-ifdefs-v2
+++ 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-v2 kernel/power/disk.c
--- a/kernel/power/disk.c~pm-rework-includes-remove-arch-ifdefs-v2
+++ 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-v2 kernel/power/swsusp.c
--- a/kernel/power/swsusp.c~pm-rework-includes-remove-arch-ifdefs-v2
+++ 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@igel.co.jp are

origin.patch
linux-next.patch
early-platform-driver-v3.patch
clocksource-pass-clocksource-to-read-callback.patch
clocksource-add-enable-and-disable-callbacks.patch