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
/
tls.c
diff --git
a/arch/um/os-Linux/tls.c
b/arch/um/os-Linux/tls.c
index
9cb09a4
..
3385784
100644
(file)
--- a/
arch/um/os-Linux/tls.c
+++ b/
arch/um/os-Linux/tls.c
@@
-1,6
+1,8
@@
#include <errno.h>
#include <sys/ptrace.h>
#include <errno.h>
#include <sys/ptrace.h>
+#include <sys/syscall.h>
#include <asm/ldt.h>
#include <asm/ldt.h>
+#include <unistd.h>
#include "sysdep/tls.h"
#include "uml-config.h"
#include "sysdep/tls.h"
#include "uml-config.h"
@@
-48,14
+50,11
@@
int os_get_thread_area(user_desc_t *info, int pid)
#ifdef UML_CONFIG_MODE_TT
#include "linux/unistd.h"
#ifdef UML_CONFIG_MODE_TT
#include "linux/unistd.h"
-static _syscall1(int, get_thread_area, user_desc_t *, u_info);
-static _syscall1(int, set_thread_area, user_desc_t *, u_info);
-
int do_set_thread_area_tt(user_desc_t *info)
{
int ret;
int do_set_thread_area_tt(user_desc_t *info)
{
int ret;
- ret = s
et_thread_area(
info);
+ ret = s
yscall(__NR_set_thread_area,
info);
if (ret < 0) {
ret = -errno;
}
if (ret < 0) {
ret = -errno;
}
@@
-66,7
+65,7
@@
int do_get_thread_area_tt(user_desc_t *info)
{
int ret;
{
int ret;
- ret =
get_thread_area(
info);
+ ret =
syscall(__NR_get_thread_area,
info);
if (ret < 0) {
ret = -errno;
}
if (ret < 0) {
ret = -errno;
}