Skip to contentSkip to conversation

UML build failure with 2.6.18

DISCUSSION Mitch 1 participant 1 message Sep 20, 2006 User-mode Linux (UML)

lore
Share & tools
lore

Mitch

author
#0 lore raw

Hi Jeff,

That works perfectly as did the previous patch. I knew how to fix the problem anyhow, just wanted to know why i/if was the only person having thr problem. I'm running glibc-2.3.6 and gcc-4.0.3.

Cheers
Mithc

-------- Original Message --------
Subject: Re: UML build failure with 2.6.18
Date: Wed, 20 Sep 2006 13:40:26 -0400
From: Jeff Dike <[email protected]>
To: Mitch <[email protected]>
CC: [email protected], "Bill Rugolsky Jr." <[email protected]>
References: <[email protected]>

Quoted 2 lines · Mitch

It's no distro (built up myself, so you can assume a gentoo type build). I'm building from scratch, so it should use no headers since i'm building a kernel.

UML interacts with the host, by making system calls, so it needs the host's libc headers.

Try the patch below.

Jeff

arch/um/os-Linux/process.c +1 -3
Index: linux-2.6.17/arch/um/os-Linux/process.c
===================================================================
@@ -140,11 +140,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)
arch/um/os-Linux/sys-i386/tls.c +0 -2
Index: linux-2.6.17/arch/um/os-Linux/sys-i386/tls.c
===================================================================
@@ -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 *suppor
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;

arch/um/os-Linux/tls.c +2 -5
Index: linux-2.6.17/arch/um/os-Linux/tls.c
===================================================================
@@ -48,14 +48,11 @@ int os_get_thread_area(user_desc_t *info
 #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 *i
 {
 	int ret;
 
-	ret = get_thread_area(info);
+	ret = syscall(__NR_get_thread_area, info);
 	if (ret < 0) {
 		ret = -errno;
 	}