Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8af7898 authored Mar 31, 2009 by Magnus Damm Committed by Linus Torvalds Apr 01, 2009

pm: rework includes, remove arch ifdefs



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>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 5f0e3da6

arch/x86/kernel/asm-offsets_32.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -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>

arch/x86/kernel/asm-offsets_64.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -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>

arch/x86/power/cpu_32.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -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;

arch/x86/power/cpu_64.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -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);

arch/x86/power/hibernate_64.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -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;