pm: rework includes, remove arch ifdefs
Subsystems (4)
PATCH 1/1 pm: rework includes, remove arch ifdefs
From: Magnus Damm <[email protected]>
This patch contains 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.
include/linux/suspend.h | 3 --- kernel/power/disk.c | 1 + kernel/power/swsusp.c | 1 + 3 files changed, 2 insertions(+), 3 deletions(-)
include/linux/suspend.h +0 -3
@@ -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>
kernel/power/disk.c +1 -0
@@ -22,6 +22,7 @@#include <linux/console.h> #include <linux/cpu.h> #include <linux/freezer.h> +#include <asm/suspend.h> #include "power.h"
kernel/power/swsusp.c +1 -0
@@ -51,6 +51,7 @@#include <linux/highmem.h> #include <linux/time.h> #include <linux/rbtree.h> +#include <linux/io.h> #include "power.h"
Quoted 4 lines · On Mon, 23 Feb 2009 17:02:04 +0900 Magnus Damm <[email protected]> wrote:
This patch contains the following header file changes:
- remove arch ifdefs andasm/suspend.hfromlinux/suspend.h
- addasm/suspend.htodisk.c(forarch_prepare_suspend())
- addlinux/io.htoswsusp.c(forioremap())
x86_64 allmodconfig:
In file included from arch/x86/kernel/asm-offsets.c:4:arch/x86/kernel/asm-offsets_64.c: In function 'main':arch/x86/kernel/asm-offsets_64.c:109: error: invalid use of undefined type 'struct saved_context' arch/x86/kernel/asm-offsets_64.c:110: error: invalid use of undefined type 'struct saved_context' arch/x86/kernel/asm-offsets_64.c:111: error: invalid use of undefined type 'struct saved_context' arch/x86/kernel/asm-offsets_64.c:112: error: invalid use of undefined type 'struct saved_context' arch/x86/kernel/asm-offsets_64.c:113: error: invalid use of undefined type 'struct saved_context'
Quoted 4 lines · On Mon, 23 Feb 2009 17:02:04 +0900 Magnus Damm <[email protected]> wrote:
This patch contains the following header file changes:
- remove arch ifdefs andasm/suspend.hfromlinux/suspend.h
- addasm/suspend.htodisk.c(forarch_prepare_suspend())
- addlinux/io.htoswsusp.c(forioremap())
x86_64 allmodconfig:
In file included from arch/x86/kernel/asm-offsets.c:4:arch/x86/kernel/asm-offsets_64.c: In function 'main':arch/x86/kernel/asm-offsets_64.c:109: error: invalid use of undefined type 'struct saved_context' arch/x86/kernel/asm-offsets_64.c:110: error: invalid use of undefined type 'struct saved_context' arch/x86/kernel/asm-offsets_64.c:111: error: invalid use of undefined type 'struct saved_context' arch/x86/kernel/asm-offsets_64.c:112: error: invalid use of undefined type 'struct saved_context' arch/x86/kernel/asm-offsets_64.c:113: error: invalid use of undefined type 'struct saved_context'
PATCH 1/1 pm: rework includes, remove arch ifdefs V2
In reply to Magnus DammFrom: Magnus Damm <[email protected]>
This patch contains 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
---
These are the only generic changes needed to get
CONFIG_HIBERNATION working on SuperH.
Changes since V1:
- x86 32/64 bit compile fixes, thanks akpm!
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(-)
arch/x86/kernel/asm-offsets_32.c +1 -0
@@ -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
@@ -17,6 +17,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
@@ -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
@@ -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
@@ -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;
include/linux/suspend.h +0 -3
@@ -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>
kernel/power/disk.c +1 -0
@@ -22,6 +22,7 @@#include <linux/console.h> #include <linux/cpu.h> #include <linux/freezer.h> +#include <asm/suspend.h> #include "power.h"
kernel/power/swsusp.c +1 -0
@@ -51,6 +51,7 @@#include <linux/highmem.h> #include <linux/time.h> #include <linux/rbtree.h> +#include <linux/io.h> #include "power.h"
Re: [PATCH] pm: rework includes, remove arch ifdefs V2
Quoted 7 lines · Magnus Damm
From: Magnus Damm <[email protected]>
This patch contains the following header file changes:
- remove arch ifdefs andasm/suspend.hfromlinux/suspend.h
- addasm/suspend.htodisk.c(forarch_prepare_suspend())
- addlinux/io.htoswsusp.c(forioremap())
- x86 32/64 bit compile fixes
Looks ok to me, but I did not test it. ACK.
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Re: [linux-pm] [PATCH] pm: rework includes, remove arch ifdefs V2
In reply to Magnus DammQuoted 7 lines · Magnus Damm
From: Magnus Damm <[email protected]>
This patch contains the following header file changes:
- remove arch ifdefs andasm/suspend.hfromlinux/suspend.h
- addasm/suspend.htodisk.c(forarch_prepare_suspend())
- addlinux/io.htoswsusp.c(forioremap())
- x86 32/64 bit compile fixes
Looks ok to me, but I did not test it. ACK.
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html