diff options
author | Jeff Dike <jdike@addtoit.com> | 2006-01-11 15:17:28 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-11 21:42:10 -0500 |
commit | 621009f4baf24581211dbb7b0816e01ed9fa8496 (patch) | |
tree | 9fb6f53b0b0e3d55d3d4e1de60f6b9ab66accc23 /arch/um | |
parent | a174b30e2963a02e9657f4ac69b2b500993bf0d4 (diff) |
[PATCH] uml: fix debug output on x86_64
The debug-stub patch was broken on x86_64 because it thinks the frame size
there is 168 words. In reality, it is 168 bytes, and using HOST_FRAME_SIZE,
which is expressed in consistent units across architectures, fixes this.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/um')
-rw-r--r-- | arch/um/kernel/skas/process.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/um/kernel/skas/process.c b/arch/um/kernel/skas/process.c index 9264d4021df..3b3955d8440 100644 --- a/arch/um/kernel/skas/process.c +++ b/arch/um/kernel/skas/process.c | |||
@@ -68,7 +68,7 @@ void wait_stub_done(int pid, int sig, char * fname) | |||
68 | 68 | ||
69 | if((n < 0) || !WIFSTOPPED(status) || | 69 | if((n < 0) || !WIFSTOPPED(status) || |
70 | (WSTOPSIG(status) != SIGUSR1 && WSTOPSIG(status) != SIGTRAP)){ | 70 | (WSTOPSIG(status) != SIGUSR1 && WSTOPSIG(status) != SIGTRAP)){ |
71 | unsigned long regs[FRAME_SIZE]; | 71 | unsigned long regs[HOST_FRAME_SIZE]; |
72 | if(ptrace(PTRACE_GETREGS, pid, 0, regs) < 0) | 72 | if(ptrace(PTRACE_GETREGS, pid, 0, regs) < 0) |
73 | printk("Failed to get registers from stub, " | 73 | printk("Failed to get registers from stub, " |
74 | "errno = %d\n", errno); | 74 | "errno = %d\n", errno); |
@@ -76,7 +76,7 @@ void wait_stub_done(int pid, int sig, char * fname) | |||
76 | int i; | 76 | int i; |
77 | 77 | ||
78 | printk("Stub registers -\n"); | 78 | printk("Stub registers -\n"); |
79 | for(i = 0; i < FRAME_SIZE; i++) | 79 | for(i = 0; i < HOST_FRAME_SIZE; i++) |
80 | printk("\t%d - %lx\n", i, regs[i]); | 80 | printk("\t%d - %lx\n", i, regs[i]); |
81 | } | 81 | } |
82 | panic("%s : failed to wait for SIGUSR1/SIGTRAP, " | 82 | panic("%s : failed to wait for SIGUSR1/SIGTRAP, " |