Commit 621009f4 authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds

[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: default avatarJeff Dike <jdike@addtoit.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a174b30e
...@@ -68,7 +68,7 @@ void wait_stub_done(int pid, int sig, char * fname) ...@@ -68,7 +68,7 @@ void wait_stub_done(int pid, int sig, char * fname)
if((n < 0) || !WIFSTOPPED(status) || if((n < 0) || !WIFSTOPPED(status) ||
(WSTOPSIG(status) != SIGUSR1 && WSTOPSIG(status) != SIGTRAP)){ (WSTOPSIG(status) != SIGUSR1 && WSTOPSIG(status) != SIGTRAP)){
unsigned long regs[FRAME_SIZE]; unsigned long regs[HOST_FRAME_SIZE];
if(ptrace(PTRACE_GETREGS, pid, 0, regs) < 0) if(ptrace(PTRACE_GETREGS, pid, 0, regs) < 0)
printk("Failed to get registers from stub, " printk("Failed to get registers from stub, "
"errno = %d\n", errno); "errno = %d\n", errno);
...@@ -76,7 +76,7 @@ void wait_stub_done(int pid, int sig, char * fname) ...@@ -76,7 +76,7 @@ void wait_stub_done(int pid, int sig, char * fname)
int i; int i;
printk("Stub registers -\n"); printk("Stub registers -\n");
for(i = 0; i < FRAME_SIZE; i++) for(i = 0; i < HOST_FRAME_SIZE; i++)
printk("\t%d - %lx\n", i, regs[i]); printk("\t%d - %lx\n", i, regs[i]);
} }
panic("%s : failed to wait for SIGUSR1/SIGTRAP, " panic("%s : failed to wait for SIGUSR1/SIGTRAP, "
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment