diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-14 15:18:01 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-14 15:18:01 -0500 |
| commit | f33b5d783b4f56be5ace6a1c98fb5f76b2d2d07d (patch) | |
| tree | b027b5f3429d416b3da5b9195024007dab062a5e /include/asm-powerpc/kexec.h | |
| parent | e935d5da8e5d12fabe5b632736c50eae0427e8c8 (diff) | |
| parent | 67963132638e67ad3c5aa16765e6f3f2f3cdd85c (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'include/asm-powerpc/kexec.h')
| -rw-r--r-- | include/asm-powerpc/kexec.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-powerpc/kexec.h b/include/asm-powerpc/kexec.h index bda2f217e6fe..6a2af2f6853b 100644 --- a/include/asm-powerpc/kexec.h +++ b/include/asm-powerpc/kexec.h | |||
| @@ -93,7 +93,8 @@ static inline void crash_setup_regs(struct pt_regs *newregs, | |||
| 93 | "mfxer %0\n" | 93 | "mfxer %0\n" |
| 94 | "std %0, 296(%2)\n" | 94 | "std %0, 296(%2)\n" |
| 95 | : "=&r" (tmp1), "=&r" (tmp2) | 95 | : "=&r" (tmp1), "=&r" (tmp2) |
| 96 | : "b" (newregs)); | 96 | : "b" (newregs) |
| 97 | : "memory"); | ||
| 97 | } | 98 | } |
| 98 | } | 99 | } |
| 99 | #else | 100 | #else |
