diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2007-05-03 08:31:38 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-05-07 06:31:14 -0400 |
commit | 543b9fd3528f64c4b20439de0edb453764482de7 (patch) | |
tree | 50271e7d5365b088bea63a5a2938aedf3aa87741 /arch/powerpc/kernel/asm-offsets.c | |
parent | 7e11580b362fc64693de7ad5c11fbf3d1d9d0e50 (diff) |
[POWERPC] powermac: Suspend to disk on G5
Powermac G5 suspend to disk implementation. The code is platform
agnostic but only tested on powermac, no other 64-bit powerpc
machines.
Because nvidiafb still breaks suspend I have marked it EXPERIMENTAL on
powermac and because I can't test it and some lowlevel code will need
changes it is BROKEN on all other 64-bit platforms.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/asm-offsets.c')
-rw-r--r-- | arch/powerpc/kernel/asm-offsets.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c index 0c5150c69175..8f48560b7ee2 100644 --- a/arch/powerpc/kernel/asm-offsets.c +++ b/arch/powerpc/kernel/asm-offsets.c | |||
@@ -21,12 +21,12 @@ | |||
21 | #include <linux/types.h> | 21 | #include <linux/types.h> |
22 | #include <linux/mman.h> | 22 | #include <linux/mman.h> |
23 | #include <linux/mm.h> | 23 | #include <linux/mm.h> |
24 | #include <linux/suspend.h> | ||
24 | #ifdef CONFIG_PPC64 | 25 | #ifdef CONFIG_PPC64 |
25 | #include <linux/time.h> | 26 | #include <linux/time.h> |
26 | #include <linux/hardirq.h> | 27 | #include <linux/hardirq.h> |
27 | #else | 28 | #else |
28 | #include <linux/ptrace.h> | 29 | #include <linux/ptrace.h> |
29 | #include <linux/suspend.h> | ||
30 | #endif | 30 | #endif |
31 | 31 | ||
32 | #include <asm/io.h> | 32 | #include <asm/io.h> |
@@ -257,11 +257,11 @@ int main(void) | |||
257 | DEFINE(CPU_SPEC_SETUP, offsetof(struct cpu_spec, cpu_setup)); | 257 | DEFINE(CPU_SPEC_SETUP, offsetof(struct cpu_spec, cpu_setup)); |
258 | DEFINE(CPU_SPEC_RESTORE, offsetof(struct cpu_spec, cpu_restore)); | 258 | DEFINE(CPU_SPEC_RESTORE, offsetof(struct cpu_spec, cpu_restore)); |
259 | 259 | ||
260 | #ifndef CONFIG_PPC64 | ||
261 | DEFINE(pbe_address, offsetof(struct pbe, address)); | 260 | DEFINE(pbe_address, offsetof(struct pbe, address)); |
262 | DEFINE(pbe_orig_address, offsetof(struct pbe, orig_address)); | 261 | DEFINE(pbe_orig_address, offsetof(struct pbe, orig_address)); |
263 | DEFINE(pbe_next, offsetof(struct pbe, next)); | 262 | DEFINE(pbe_next, offsetof(struct pbe, next)); |
264 | 263 | ||
264 | #ifndef CONFIG_PPC64 | ||
265 | DEFINE(TASK_SIZE, TASK_SIZE); | 265 | DEFINE(TASK_SIZE, TASK_SIZE); |
266 | DEFINE(NUM_USER_SEGMENTS, TASK_SIZE>>28); | 266 | DEFINE(NUM_USER_SEGMENTS, TASK_SIZE>>28); |
267 | #endif /* ! CONFIG_PPC64 */ | 267 | #endif /* ! CONFIG_PPC64 */ |