diff options
author | Allan Graves <allan.graves@oracle.com> | 2005-10-04 14:53:52 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-04 13:22:01 -0700 |
commit | fad1c45c939bb246a488be1fa06f539e85b80545 (patch) | |
tree | 2a368da0e73817083caed84f4fe8085fcb654554 /include/asm-um/processor-x86_64.h | |
parent | 71dc036247573e377703233af289019f4aa3176e (diff) | |
download | op-kernel-dev-fad1c45c939bb246a488be1fa06f539e85b80545.zip op-kernel-dev-fad1c45c939bb246a488be1fa06f539e85b80545.tar.gz |
[PATCH] uml: Fix sysrq-r support for skas mode
The old code had the IP and SP coming from the registers in the thread
struct, which are completely wrong since those are the userspace
registers. This fixes that by pulling the correct values from the
jmp_buf in which the kernel state of each thread is stored.
Signed-off-by: Allan Graves <allan.graves@oracle.com>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-um/processor-x86_64.h')
-rw-r--r-- | include/asm-um/processor-x86_64.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/include/asm-um/processor-x86_64.h b/include/asm-um/processor-x86_64.h index 0beb9a4..e1e1255 100644 --- a/include/asm-um/processor-x86_64.h +++ b/include/asm-um/processor-x86_64.h @@ -36,17 +36,9 @@ extern inline void rep_nop(void) #define ARCH_IS_STACKGROW(address) \ (address + 128 >= UPT_SP(¤t->thread.regs.regs)) +#define KSTK_EIP(tsk) KSTK_REG(tsk, RIP) +#define KSTK_ESP(tsk) KSTK_REG(tsk, RSP) + #include "asm/processor-generic.h" #endif - -/* - * Overrides for Emacs so that we follow Linus's tabbing style. - * Emacs will notice this stuff at the end of the file and automatically - * adjust the settings for this buffer only. This must remain at the end - * of the file. - * --------------------------------------------------------------------------- - * Local variables: - * c-file-style: "linux" - * End: - */ |