Re: [uml-devel] [PATCH] Ok, I build x86-64 -skas0, and it still segfaults.

[Rob Landley <rob@landley.net>]

[-- Attachment #1: Type: text/plain, Size: 1311 bytes --]

On Monday 14 November 2005 19:38, Jeff Dike wrote:
> On Mon, Nov 14, 2005 at 05:45:44PM -0600, Rob Landley wrote:
> > The breakage, by the way, (which occurs when you fix the failing hunk #2
> > up by hand) stems from the inability to find asm/signal.h:
>
> What distro is this?  asm/signal is in glibc-kernheaders here:
>
> % rpm -q -f /usr/include/asm/signal.h
> glibc-kernheaders-2.4-9.1.94

Well, according to /proc/version, it's PLD:

Linux version 2.6.11.10-6 (builder@serwus) (gcc version 3.3.5 (PLD Linux)) #1 
Fri May 27 20:55:12 UTC 2005

rpm has a package "basesystem" that's version 1.99.

Here's their web page: http://www.pld.org.pl/

I think this is the distro Maszur originally did his linux-libc-headers 
package for, so I'm guessing that's what they're using.  (Not the glibc 
stuff.)  I use uClibc a lot elsewhere, and that generally uses Mazur's 
headers rather than the glibc ones too.

It has:

[rob@rg4 include]$ find /usr/include -name signal.h
/usr/include/linux/signal.h
/usr/include/signal.h
/usr/include/sys/signal.h

Hmm, I'm somewhat familiar with Mazur's headers and may be able to fix this 
up...

Ok, the attached patch builds for me.  (I didn't say it was _right_, I said it 
builds. :)

And let's see how it runs...

Nope, same failure.  Want the new panic and register dump?

[-- Attachment #2: headers.patch --]
[-- Type: text/x-diff, Size: 466 bytes --]

--- linux-2.6.15-rc1/arch/um/sys-x86_64/stub_segv.c	2005-11-14 23:20:54.855517272 +0100
+++ linux-2.6.14/arch/um/sys-x86_64/stub_segv.c	2005-11-15 03:11:28.580804656 +0100
@@ -4,11 +4,9 @@
  */
 
 #include <linux/compiler.h>
-#include <asm/signal.h>
+#include <signal.h>
 #include <asm/unistd.h>
 #include <asm/sigcontext.h>
-#include <asm/siginfo.h>
-#include <asm/ucontext.h>
 #include "uml-config.h"
 #include "sysdep/sigcontext.h"
 #include "sysdep/faultinfo.h"