diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2006-03-20 11:53:56 -0500 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2006-03-20 11:53:56 -0500 |
commit | 61c5504a0ed66c8b460f9a006eedaea2ee587e33 (patch) | |
tree | 2cf21d235f17e80d47fdb4ee1248865be8196d4d /include/asm-powerpc/kexec.h | |
parent | 9585da3729e7e27bf22818625c10ac6c64ebb609 (diff) | |
parent | 2c276603c3e5ebf38155a9d1fbbda656d52d138e (diff) |
Merge branch 'master'
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 |