]> err.no Git - linux-2.6/commitdiff
[PATCH] uml: fix debug output on x86_64
authorJeff Dike <jdike@addtoit.com>
Wed, 11 Jan 2006 20:17:28 +0000 (12:17 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 12 Jan 2006 02:42:10 +0000 (18:42 -0800)
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>
arch/um/kernel/skas/process.c

index 9264d4021dfe23f73c0adb02d65fdf3eeea25914..3b3955d844070f781f7d3b1ffe69ef969ae395ff 100644 (file)
@@ -68,7 +68,7 @@ void wait_stub_done(int pid, int sig, char * fname)
 
         if((n < 0) || !WIFSTOPPED(status) ||
            (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)
                        printk("Failed to get registers from stub, "
                               "errno = %d\n", errno);
@@ -76,7 +76,7 @@ void wait_stub_done(int pid, int sig, char * fname)
                        int i;
 
                        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]);
                }
                 panic("%s : failed to wait for SIGUSR1/SIGTRAP, "