54ae36f24b
The calculation of CONFIG_STUB_CODE and CONFIG_STUB_DATA didn't take into account anything but 3G/1G and 2G/2G, leaving the other vmsplits out in the cold. I'd rather not duplicate the four known host vmsplit cases for each of these symbols. I'd also like to calculate them based on the highest userspace address. The Kconfig language seems not to allow calculation of hex constants, so I moved this to as-layout.h. CONFIG_STUB_CODE, CONFIG_STUB_DATA, and CONFIG_STUB_START are now gone. In their place are STUB_CODE, STUB_DATA, and STUB_START in as-layout.h. i386 and x86_64 seem to differ as to whether an unadorned constant is an int or a long, so I cast them to unsigned long so they can be printed consistently. However, they are also used in stub.S, where C types don't work so well. So, there are ASM_ versions of these constants for use in stub.S. I also ifdef-ed the non-asm-friendly portion of as-layout.h. With this in place, most of the rest of this patch is changing CONFIG_STUB_* to STUB_*, except in stub.S, where they are changed to ASM_STUB_*. defconfig has the old symbols deleted. I also print these addresses out in case there is any problem mapping them on the host. The two stub.S files had some trailing whitespace, so that is cleaned up here. [akpm@linux-foundation.org: coding-style fixes] Signed-off-by: Jeff Dike <jdike@linux.intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
32 lines
892 B
C
32 lines
892 B
C
/*
|
|
* Copyright (C) 2004 Jeff Dike (jdike@addtoit.com)
|
|
* Licensed under the GPL
|
|
*/
|
|
|
|
#include <signal.h>
|
|
#include <sys/select.h> /* The only way I can see to get sigset_t */
|
|
#include <asm/unistd.h>
|
|
#include "as-layout.h"
|
|
#include "uml-config.h"
|
|
#include "sysdep/stub.h"
|
|
#include "sysdep/sigcontext.h"
|
|
#include "sysdep/faultinfo.h"
|
|
|
|
void __attribute__ ((__section__ (".__syscall_stub")))
|
|
stub_segv_handler(int sig)
|
|
{
|
|
struct sigcontext *sc = (struct sigcontext *) (&sig + 1);
|
|
int pid;
|
|
|
|
GET_FAULTINFO_FROM_SC(*((struct faultinfo *) STUB_DATA), sc);
|
|
|
|
pid = stub_syscall0(__NR_getpid);
|
|
stub_syscall2(__NR_kill, pid, SIGUSR1);
|
|
|
|
/* Load pointer to sigcontext into esp, since we need to leave
|
|
* the stack in its original form when we do the sigreturn here, by
|
|
* hand.
|
|
*/
|
|
__asm__ __volatile__("mov %0,%%esp ; movl %1, %%eax ; "
|
|
"int $0x80" : : "a" (sc), "g" (__NR_sigreturn));
|
|
}
|