]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
pm: rework includes, remove arch ifdefs
authorMagnus Damm <damm@igel.co.jp>
Tue, 31 Mar 2009 22:23:37 +0000 (15:23 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 1 Apr 2009 15:59:16 +0000 (08:59 -0700)
commita8af78982ff4c0b3731527b0217d286a343a3089
tree10f0ebe13c999dd54efdf79ff606b65e7952b69d
parent5f0e3da6e186598bbd2569410ab60fa645ba00c9
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>
arch/x86/kernel/asm-offsets_32.c
arch/x86/kernel/asm-offsets_64.c
arch/x86/power/cpu_32.c
arch/x86/power/cpu_64.c
arch/x86/power/hibernate_64.c
include/linux/suspend.h
kernel/power/disk.c
kernel/power/swsusp.c