diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-26 13:13:19 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-26 13:13:19 -0400 |
| commit | c226951b93f7cd7c3a10b17384535b617bd43fd0 (patch) | |
| tree | 07b8796a5c99fbbf587b8d0dbcbc173cfe5e381e /include/asm-um/processor-generic.h | |
| parent | b0df3bd1e553e901ec7297267611a5db88240b38 (diff) | |
| parent | e8216dee838c09776680a6f1a2e54d81f3cdfa14 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'include/asm-um/processor-generic.h')
| -rw-r--r-- | include/asm-um/processor-generic.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/asm-um/processor-generic.h b/include/asm-um/processor-generic.h index 824c28896382..afa4fe1ca9f1 100644 --- a/include/asm-um/processor-generic.h +++ b/include/asm-um/processor-generic.h | |||
| @@ -138,9 +138,7 @@ extern struct cpuinfo_um cpu_data[]; | |||
| 138 | 138 | ||
| 139 | #ifdef CONFIG_MODE_SKAS | 139 | #ifdef CONFIG_MODE_SKAS |
| 140 | #define KSTK_REG(tsk, reg) \ | 140 | #define KSTK_REG(tsk, reg) \ |
| 141 | ({ union uml_pt_regs regs; \ | 141 | get_thread_reg(reg, tsk->thread.mode.skas.switch_buf) |
| 142 | get_thread_regs(®s, tsk->thread.mode.skas.switch_buf); \ | ||
| 143 | UPT_REG(®s, reg); }) | ||
| 144 | #else | 142 | #else |
| 145 | #define KSTK_REG(tsk, reg) (0xbadbabe) | 143 | #define KSTK_REG(tsk, reg) (0xbadbabe) |
| 146 | #endif | 144 | #endif |