* [PATCH] pm: rework includes, remove arch ifdefs
@ 2009-02-23 8:02 Magnus Damm
2009-02-24 23:45 ` Andrew Morton
` (3 more replies)
0 siblings, 4 replies; 7+ messages in thread
From: Magnus Damm @ 2009-02-23 8:02 UTC (permalink / raw)
To: linux-sh
From: Magnus Damm <damm@igel.co.jp>
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())
Signed-off-by: Magnus Damm <damm@igel.co.jp>
---
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(-)
--- 0001/include/linux/suspend.h
+++ work/include/linux/suspend.h 2009-02-23 14:44:28.000000000 +0900
@@ -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>
--- 0001/kernel/power/disk.c
+++ work/kernel/power/disk.c 2009-02-23 14:44:02.000000000 +0900
@@ -22,6 +22,7 @@
#include <linux/console.h>
#include <linux/cpu.h>
#include <linux/freezer.h>
+#include <asm/suspend.h>
#include "power.h"
--- 0001/kernel/power/swsusp.c
+++ work/kernel/power/swsusp.c 2009-02-23 14:43:17.000000000 +0900
@@ -51,6 +51,7 @@
#include <linux/highmem.h>
#include <linux/time.h>
#include <linux/rbtree.h>
+#include <linux/io.h>
#include "power.h"
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] pm: rework includes, remove arch ifdefs
2009-02-23 8:02 [PATCH] pm: rework includes, remove arch ifdefs Magnus Damm
@ 2009-02-24 23:45 ` Andrew Morton
2009-02-24 23:45 ` Andrew Morton
` (2 subsequent siblings)
3 siblings, 0 replies; 7+ messages in thread
From: Andrew Morton @ 2009-02-24 23:45 UTC (permalink / raw)
To: linux-sh
On Mon, 23 Feb 2009 17:02:04 +0900
Magnus Damm <magnus.damm@gmail.com> wrote:
> 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_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'
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] pm: rework includes, remove arch ifdefs
2009-02-23 8:02 [PATCH] pm: rework includes, remove arch ifdefs Magnus Damm
2009-02-24 23:45 ` Andrew Morton
@ 2009-02-24 23:45 ` Andrew Morton
2009-02-25 3:59 ` [PATCH] pm: rework includes, remove arch ifdefs V2 Magnus Damm
2009-03-10 11:24 ` [linux-pm] " Pavel Machek
3 siblings, 0 replies; 7+ messages in thread
From: Andrew Morton @ 2009-02-24 23:45 UTC (permalink / raw)
To: Magnus Damm; +Cc: linux-pm, linux-sh
On Mon, 23 Feb 2009 17:02:04 +0900
Magnus Damm <magnus.damm@gmail.com> wrote:
> 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_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'
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] pm: rework includes, remove arch ifdefs V2
2009-02-23 8:02 [PATCH] pm: rework includes, remove arch ifdefs Magnus Damm
2009-02-24 23:45 ` Andrew Morton
2009-02-24 23:45 ` Andrew Morton
@ 2009-02-25 3:59 ` Magnus Damm
2009-03-10 11:24 ` Pavel Machek
2009-03-10 11:24 ` [linux-pm] " Pavel Machek
3 siblings, 1 reply; 7+ messages in thread
From: Magnus Damm @ 2009-02-25 3:59 UTC (permalink / raw)
To: linux-sh
From: Magnus Damm <damm@igel.co.jp>
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
Signed-off-by: Magnus Damm <damm@igel.co.jp>
---
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(-)
--- 0001/arch/x86/kernel/asm-offsets_32.c
+++ work/arch/x86/kernel/asm-offsets_32.c 2009-02-25 12:20:52.000000000 +0900
@@ -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>
--- 0001/arch/x86/kernel/asm-offsets_64.c
+++ work/arch/x86/kernel/asm-offsets_64.c 2009-02-25 12:20:52.000000000 +0900
@@ -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>
--- 0001/arch/x86/power/cpu_32.c
+++ work/arch/x86/power/cpu_32.c 2009-02-25 12:20:52.000000000 +0900
@@ -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;
--- 0001/arch/x86/power/cpu_64.c
+++ work/arch/x86/power/cpu_64.c 2009-02-25 12:20:52.000000000 +0900
@@ -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);
--- 0001/arch/x86/power/hibernate_64.c
+++ work/arch/x86/power/hibernate_64.c 2009-02-25 12:20:52.000000000 +0900
@@ -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;
--- 0001/include/linux/suspend.h
+++ work/include/linux/suspend.h 2009-02-24 15:03:52.000000000 +0900
@@ -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>
--- 0001/kernel/power/disk.c
+++ work/kernel/power/disk.c 2009-02-24 15:03:52.000000000 +0900
@@ -22,6 +22,7 @@
#include <linux/console.h>
#include <linux/cpu.h>
#include <linux/freezer.h>
+#include <asm/suspend.h>
#include "power.h"
--- 0001/kernel/power/swsusp.c
+++ work/kernel/power/swsusp.c 2009-02-24 15:03:52.000000000 +0900
@@ -51,6 +51,7 @@
#include <linux/highmem.h>
#include <linux/time.h>
#include <linux/rbtree.h>
+#include <linux/io.h>
#include "power.h"
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [linux-pm] [PATCH] pm: rework includes, remove arch ifdefs V2
2009-02-23 8:02 [PATCH] pm: rework includes, remove arch ifdefs Magnus Damm
` (2 preceding siblings ...)
2009-02-25 3:59 ` [PATCH] pm: rework includes, remove arch ifdefs V2 Magnus Damm
@ 2009-03-10 11:24 ` Pavel Machek
3 siblings, 0 replies; 7+ messages in thread
From: Pavel Machek @ 2009-03-10 11:24 UTC (permalink / raw)
To: linux-sh
On Wed 2009-02-25 12:59:29, Magnus Damm wrote:
> From: Magnus Damm <damm@igel.co.jp>
>
> 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
Looks ok to me, but I did not test it. ACK.
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] pm: rework includes, remove arch ifdefs
@ 2009-02-23 8:02 Magnus Damm
0 siblings, 0 replies; 7+ messages in thread
From: Magnus Damm @ 2009-02-23 8:02 UTC (permalink / raw)
To: linux-pm; +Cc: akpm, linux-sh
From: Magnus Damm <damm@igel.co.jp>
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())
Signed-off-by: Magnus Damm <damm@igel.co.jp>
---
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(-)
--- 0001/include/linux/suspend.h
+++ work/include/linux/suspend.h 2009-02-23 14:44:28.000000000 +0900
@@ -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>
--- 0001/kernel/power/disk.c
+++ work/kernel/power/disk.c 2009-02-23 14:44:02.000000000 +0900
@@ -22,6 +22,7 @@
#include <linux/console.h>
#include <linux/cpu.h>
#include <linux/freezer.h>
+#include <asm/suspend.h>
#include "power.h"
--- 0001/kernel/power/swsusp.c
+++ work/kernel/power/swsusp.c 2009-02-23 14:43:17.000000000 +0900
@@ -51,6 +51,7 @@
#include <linux/highmem.h>
#include <linux/time.h>
#include <linux/rbtree.h>
+#include <linux/io.h>
#include "power.h"
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2009-03-10 11:24 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-02-23 8:02 [PATCH] pm: rework includes, remove arch ifdefs Magnus Damm
2009-02-24 23:45 ` Andrew Morton
2009-02-24 23:45 ` Andrew Morton
2009-02-25 3:59 ` [PATCH] pm: rework includes, remove arch ifdefs V2 Magnus Damm
2009-03-10 11:24 ` Pavel Machek
2009-03-10 11:24 ` [linux-pm] " Pavel Machek
-- strict thread matches above, loose matches on Subject: below --
2009-02-23 8:02 [PATCH] pm: rework includes, remove arch ifdefs Magnus Damm
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.