Commit e392c24a authored by Jeff Dike's avatar Jeff Dike Committed by Greg Kroah-Hartman

UML: Fix UML build failure

don't know if the following is already queued, it fixes an ARCH=um build
failure, evidence here:
http://marc.theaimsgroup.com/?l=linux-kernel&m=115875912525137&w=2
and following thread.
Cc-ing uml maintainers and I hope I didn't follow too many
Submitting-patches rules...

The patch is taken from:
http://user-mode-linux.sourceforge.net/work/current/2.6/2.6.18/patches/no-syscallx

Since the syscallx macros seem to be under threat, this patch stops
using them, using syscall instead.
Acked-by: default avatarJeff Dike <jdike@addtoit.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent bc019aa5
......@@ -141,11 +141,9 @@ void os_usr1_process(int pid)
* syscalls, and also breaks with clone(), which does not unshare the TLS.
*/
inline _syscall0(pid_t, getpid)
int os_getpid(void)
{
return(getpid());
return syscall(__NR_getpid);
}
int os_getpgrp(void)
......
......@@ -3,8 +3,6 @@
#include "sysdep/tls.h"
#include "user_util.h"
static _syscall1(int, get_thread_area, user_desc_t *, u_info);
/* Checks whether host supports TLS, and sets *tls_min according to the value
* valid on the host.
* i386 host have it == 6; x86_64 host have it == 12, for i386 emulation. */
......@@ -17,7 +15,7 @@ void check_host_supports_tls(int *supports_tls, int *tls_min) {
user_desc_t info;
info.entry_number = val[i];
if (get_thread_area(&info) == 0) {
if(syscall(__NR_get_thread_area, &info) == 0){
*tls_min = val[i];
*supports_tls = 1;
return;
......
......@@ -48,14 +48,11 @@ int os_get_thread_area(user_desc_t *info, int pid)
#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;
ret = set_thread_area(info);
ret = syscall(__NR_set_thread_area, info);
if (ret < 0) {
ret = -errno;
}
......@@ -66,7 +63,7 @@ int do_get_thread_area_tt(user_desc_t *info)
{
int ret;
ret = get_thread_area(info);
ret = syscall(__NR_get_thread_area, info);
if (ret < 0) {
ret = -errno;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment