git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
arch
/
um
/
os-Linux
/
process.c
diff --git
a/arch/um/os-Linux/process.c
b/arch/um/os-Linux/process.c
index
233be2f
..
c8bf772
100644
(file)
--- a/
arch/um/os-Linux/process.c
+++ b/
arch/um/os-Linux/process.c
@@
-141,11
+141,9
@@
void os_usr1_process(int pid)
* syscalls, and also breaks with clone(), which does not unshare the TLS.
*/
* syscalls, and also breaks with clone(), which does not unshare the TLS.
*/
-inline _syscall0(pid_t, getpid)
-
int os_getpid(void)
{
int os_getpid(void)
{
- return
(getpid()
);
+ return
syscall(__NR_getpid
);
}
int os_getpgrp(void)
}
int os_getpgrp(void)
@@
-250,36
+248,35
@@
void init_new_thread_stack(void *sig_stack, void (*usr1_handler)(int))
if(usr1_handler) set_handler(SIGUSR1, usr1_handler, flags, -1);
}
if(usr1_handler) set_handler(SIGUSR1, usr1_handler, flags, -1);
}
-void init_new_thread_signals(
int altstack
)
+void init_new_thread_signals(
void
)
{
{
- int flags = altstack ? SA_ONSTACK : 0;
-
- set_handler(SIGSEGV, (__sighandler_t) sig_handler, flags,
+ set_handler(SIGSEGV, (__sighandler_t) sig_handler, SA_ONSTACK,
SIGUSR1, SIGIO, SIGWINCH, SIGALRM, SIGVTALRM, -1);
SIGUSR1, SIGIO, SIGWINCH, SIGALRM, SIGVTALRM, -1);
- set_handler(SIGTRAP, (__sighandler_t) sig_handler,
flags
,
+ set_handler(SIGTRAP, (__sighandler_t) sig_handler,
SA_ONSTACK
,
SIGUSR1, SIGIO, SIGWINCH, SIGALRM, SIGVTALRM, -1);
SIGUSR1, SIGIO, SIGWINCH, SIGALRM, SIGVTALRM, -1);
- set_handler(SIGFPE, (__sighandler_t) sig_handler,
flags
,
+ set_handler(SIGFPE, (__sighandler_t) sig_handler,
SA_ONSTACK
,
SIGUSR1, SIGIO, SIGWINCH, SIGALRM, SIGVTALRM, -1);
SIGUSR1, SIGIO, SIGWINCH, SIGALRM, SIGVTALRM, -1);
- set_handler(SIGILL, (__sighandler_t) sig_handler,
flags
,
+ set_handler(SIGILL, (__sighandler_t) sig_handler,
SA_ONSTACK
,
SIGUSR1, SIGIO, SIGWINCH, SIGALRM, SIGVTALRM, -1);
SIGUSR1, SIGIO, SIGWINCH, SIGALRM, SIGVTALRM, -1);
- set_handler(SIGBUS, (__sighandler_t) sig_handler,
flags
,
+ set_handler(SIGBUS, (__sighandler_t) sig_handler,
SA_ONSTACK
,
SIGUSR1, SIGIO, SIGWINCH, SIGALRM, SIGVTALRM, -1);
set_handler(SIGUSR2, (__sighandler_t) sig_handler,
SIGUSR1, SIGIO, SIGWINCH, SIGALRM, SIGVTALRM, -1);
set_handler(SIGUSR2, (__sighandler_t) sig_handler,
- flags, SIGUSR1, SIGIO, SIGWINCH, SIGALRM, SIGVTALRM, -1);
+ SA_ONSTACK, SIGUSR1, SIGIO, SIGWINCH, SIGALRM, SIGVTALRM,
+ -1);
signal(SIGHUP, SIG_IGN);
signal(SIGHUP, SIG_IGN);
- init_irq_signals(
altstack
);
+ init_irq_signals(
1
);
}
int run_kernel_thread(int (*fn)(void *), void *arg, void **jmp_ptr)
{
jmp_buf buf;
}
int run_kernel_thread(int (*fn)(void *), void *arg, void **jmp_ptr)
{
jmp_buf buf;
- int n
, enable
;
+ int n;
*jmp_ptr = &buf;
*jmp_ptr = &buf;
- n = UML_SETJMP(&buf
, enable
);
+ n = UML_SETJMP(&buf);
if(n != 0)
if(n != 0)
- return
(n)
;
+ return
n
;
(*fn)(arg);
(*fn)(arg);
- return
(0)
;
+ return
0
;
}
}