On 7/29/06, Blaisorblade <[EMAIL PROTECTED]> wrote:
> On Wednesday 26 July 2006 15:00, Samuel Korpi wrote:
> > On 7/13/06, Jeff Dike <[EMAIL PROTECTED]> wrote:
> > > Instead of the patch mentioned earlier, you might also try the one
> > > below - it depends on klibc, so you need to apply it to a recent -mm
> > > UML. I'm thinking about sending this to Andrew, despite it's
> > > nastinesses.
> > >
> > > It applies on top of (and backs out) the other jmpbuf patch.
> >
> > Well, it didn't work in any case. Just says
> >
> > patching file arch/um/os-Linux/sys-i386/registers.c
> > patch: **** malformed patch at line 5: --- 6,5 ----
> The patch was mangled by some email program - it was published as "[uml-devel]
> [PATCH 2/7] UML - Use klibc setjmp/longjmp", download it from the uml-devel
> archive on marc.theaimsgroup.com (use the "save as plain text" link);
> probably you could redownload the mail you got from this archive, it's likely
> your mail agent corrupted it.
>
True. Seems you should always use the 'show source' or whatever
feature the mail agent has. My mistake. I now managed to run the patch
Jeff sent in this thread 'thread', but still maybe something went
wrong. The output I got is this:
patching file arch/um/os-Linux/sys-i386/registers.c
patching file arch/um/os-Linux/sys-x86_64/registers.c
patching file arch/um/Makefile
Hunk #2 succeeded at 51 with fuzz 2 (offset -2 lines).
Hunk #4 succeeded at 207 (offset -2 lines).
patching file arch/um/include/longjmp.h
patching file arch/um/os-Linux/trap.c
patching file arch/um/os-Linux/uaccess.c
patching file arch/um/os-Linux/util.c
patching file arch/um/os-Linux/process.c
patching file arch/um/os-Linux/skas/process.c
Hunk #2 FAILED at 469.
1 out of 2 hunks FAILED -- saving rejects to file
arch/um/os-Linux/skas/process.c.rej
patching file arch/um/os-Linux/Makefile
and the contents of the process.c.rej file mentioned above are listed here:
***************
*** 470,476 ****
*switch_buf = &buf;
fork_buf = fb;
if(UML_SETJMP(&buf) == 0)
- siglongjmp(*fork_buf, INIT_JMP_REMOVE_SIGSTACK);
}
void switch_threads(void *me, void *next)
--- 469,475 ----
*switch_buf = &buf;
fork_buf = fb;
if(UML_SETJMP(&buf) == 0)
+ UML_LONGJMP(fork_buf, INIT_JMP_REMOVE_SIGSTACK);
}
void switch_threads(void *me, void *next)
The same happened with the patch from the archives. And now the kernel
won't compile. Errors:
arch/um/os-Linux/util.c:109:21: error: macro "UML_SETJMP" requires 2
arguments, but only 1 given
arch/um/os-Linux/util.c: In function 'setjmp_wrapper':
arch/um/os-Linux/util.c:109: error: 'UML_SETJMP' undeclared (first use
in this function)
arch/um/os-Linux/util.c:109: error: (Each undeclared identifier is
reported only once
arch/um/os-Linux/util.c:109: error: for each function it appears in.)
make[1]: *** [arch/um/os-Linux/util.o] Error 1
make: *** [arch/um/os-Linux] Error 2
Kernel version is 2.6.17.7.
/Samuel
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
User-mode-linux-user mailing list
User-mode-linux-user@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-user
