diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-21 11:52:18 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-21 11:52:18 -0500 |
commit | b05005772f34497eb2b7415a651fe785cbe70e16 (patch) | |
tree | b176aeb7fa9baf69e77ddd83e844727490bfcf28 /include/asm-powerpc/kexec.h | |
parent | 044f324f6ea5d55391db62fca6a295b2651cb946 (diff) | |
parent | 7705a8792b0fc82fd7d4dd923724606bbfd9fb20 (diff) |
Merge branch 'origin'
Conflicts:
Documentation/video4linux/CARDLIST.cx88
drivers/media/video/cx88/Kconfig
drivers/media/video/em28xx/em28xx-video.c
drivers/media/video/saa7134/saa7134-dvb.c
Resolved as in the original merge by Mauro Carvalho Chehab
Diffstat (limited to 'include/asm-powerpc/kexec.h')
-rw-r--r-- | include/asm-powerpc/kexec.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/asm-powerpc/kexec.h b/include/asm-powerpc/kexec.h index 640a6459f2f4..6a2af2f6853b 100644 --- a/include/asm-powerpc/kexec.h +++ b/include/asm-powerpc/kexec.h | |||
@@ -33,6 +33,7 @@ | |||
33 | 33 | ||
34 | #ifdef CONFIG_KEXEC | 34 | #ifdef CONFIG_KEXEC |
35 | 35 | ||
36 | #ifndef __ASSEMBLY__ | ||
36 | #ifdef __powerpc64__ | 37 | #ifdef __powerpc64__ |
37 | /* | 38 | /* |
38 | * This function is responsible for capturing register states if coming | 39 | * This function is responsible for capturing register states if coming |
@@ -92,7 +93,8 @@ static inline void crash_setup_regs(struct pt_regs *newregs, | |||
92 | "mfxer %0\n" | 93 | "mfxer %0\n" |
93 | "std %0, 296(%2)\n" | 94 | "std %0, 296(%2)\n" |
94 | : "=&r" (tmp1), "=&r" (tmp2) | 95 | : "=&r" (tmp1), "=&r" (tmp2) |
95 | : "b" (newregs)); | 96 | : "b" (newregs) |
97 | : "memory"); | ||
96 | } | 98 | } |
97 | } | 99 | } |
98 | #else | 100 | #else |
@@ -104,7 +106,6 @@ static inline void crash_setup_regs(struct pt_regs *newregs, | |||
104 | struct pt_regs *oldregs) { } | 106 | struct pt_regs *oldregs) { } |
105 | #endif /* !__powerpc64 __ */ | 107 | #endif /* !__powerpc64 __ */ |
106 | 108 | ||
107 | #ifndef __ASSEMBLY__ | ||
108 | #define MAX_NOTE_BYTES 1024 | 109 | #define MAX_NOTE_BYTES 1024 |
109 | 110 | ||
110 | #ifdef __powerpc64__ | 111 | #ifdef __powerpc64__ |
@@ -121,6 +122,8 @@ extern void default_machine_kexec(struct kimage *image); | |||
121 | extern int default_machine_kexec_prepare(struct kimage *image); | 122 | extern int default_machine_kexec_prepare(struct kimage *image); |
122 | extern void default_machine_crash_shutdown(struct pt_regs *regs); | 123 | extern void default_machine_crash_shutdown(struct pt_regs *regs); |
123 | 124 | ||
125 | extern void machine_kexec_simple(struct kimage *image); | ||
126 | |||
124 | #endif /* ! __ASSEMBLY__ */ | 127 | #endif /* ! __ASSEMBLY__ */ |
125 | #endif /* CONFIG_KEXEC */ | 128 | #endif /* CONFIG_KEXEC */ |
126 | #endif /* __KERNEL__ */ | 129 | #endif /* __KERNEL__ */ |