On Wed, Sep 05, 2007 at 12:08:12PM -0700, Joel Kreager wrote:
> Sep 5 01:12:50 ldapserver named[1848]: starting BIND 9.4.0 -u named -t
> /var/named/chroot
> Sep 5 01:12:50 ldapserver named[1848]: found 1 CPU, using 1 worker thread
> Sep 5 01:12:50 ldapserver named[1848]: app.c:443: REQUIRE(main_thread ==
> pthread_self()) failed
> Sep 5 01:12:50 ldapserver named[1848]: exiting (due to assertion failure)
This has been fixed for a while.
> Downloaded linux-2.6.22.6 from kernel.org.
> Ran make mrproper,
> make mrproper ARCH=um
> make defconfig ARCH=um
> make ARCH=um
>
> and got:
> CC arch/um/sys-x86_64/user-offsets.s
> arch/um/sys-x86_64/user-offsets.c:16:22: error: asm/user.h: No such file
> or directory
> arch/um/sys-x86_64/user-offsets.c: In function 'foo':
> arch/um/sys-x86_64/user-offsets.c:91: error: invalid application of
> 'sizeof' to incomplete type 'struct user_regs_struct'
> make[1]: *** [arch/um/sys-x86_64/user-offsets.s] Error 1
> make: *** [arch/um/sys-x86_64/user-offsets.s] Error 2
This is also fixed - I sent the patch in a couple of weeks ago, and
it's in current -mm. It's below, if you want to apply it yourself.
Jeff
--
Work email - jdike at linux dot intel dot com
Stop including asm/user.h - it seems to be disappearing from distros.
It's replaced with sys/user.h which defines user_fpregs_struct and
user_fpxregs_struct instead of user_i387_struct and struct
user_fxsr_struct on i386.
As a bonus, on x86_64, I get to dump some stupid typedefs which were
needed in order to get asm/user.h to compile.
Signed-off-by: Jeff Dike <[EMAIL PROTECTED]>
--
arch/um/sys-i386/user-offsets.c | 6 +++---
arch/um/sys-x86_64/user-offsets.c | 9 +--------
2 files changed, 4 insertions(+), 11 deletions(-)
Index: linux-2.6.22/arch/um/sys-i386/user-offsets.c
===================================================================
--- linux-2.6.22.orig/arch/um/sys-i386/user-offsets.c 2007-08-22
09:48:38.000000000 -0400
+++ linux-2.6.22/arch/um/sys-i386/user-offsets.c 2007-08-22
09:48:44.000000000 -0400
@@ -2,9 +2,9 @@
#include <stddef.h>
#include <signal.h>
#include <sys/poll.h>
+#include <sys/user.h>
#include <sys/mman.h>
#include <asm/ptrace.h>
-#include <asm/user.h>
#define DEFINE(sym, val) \
asm volatile("\n->" #sym " %0 " #val : : "i" (val))
@@ -48,8 +48,8 @@ void foo(void)
OFFSET(HOST_SC_FP_ST, _fpstate, _st);
OFFSET(HOST_SC_FXSR_ENV, _fpstate, _fxsr_env);
- DEFINE_LONGS(HOST_FP_SIZE, sizeof(struct user_i387_struct));
- DEFINE_LONGS(HOST_XFP_SIZE, sizeof(struct user_fxsr_struct));
+ DEFINE_LONGS(HOST_FP_SIZE, sizeof(struct user_fpregs_struct));
+ DEFINE_LONGS(HOST_XFP_SIZE, sizeof(struct user_fpxregs_struct));
DEFINE(HOST_IP, EIP);
DEFINE(HOST_SP, UESP);
Index: linux-2.6.22/arch/um/sys-x86_64/user-offsets.c
===================================================================
--- linux-2.6.22.orig/arch/um/sys-x86_64/user-offsets.c 2007-08-22
09:48:38.000000000 -0400
+++ linux-2.6.22/arch/um/sys-x86_64/user-offsets.c 2007-08-22
12:22:33.000000000 -0400
@@ -3,17 +3,10 @@
#include <signal.h>
#include <sys/poll.h>
#include <sys/mman.h>
+#include <sys/user.h>
#define __FRAME_OFFSETS
#include <asm/ptrace.h>
#include <asm/types.h>
-/* For some reason, x86_64 defines u64 and u32 only in <pci/types.h>, which I
- * refuse to include here, even though they're used throughout the headers.
- * These are used in asm/user.h, and that include can't be avoided because of
- * the sizeof(struct user_regs_struct) below.
- */
-typedef __u64 u64;
-typedef __u32 u32;
-#include <asm/user.h>
#define DEFINE(sym, val) \
asm volatile("\n->" #sym " %0 " #val : : "i" (val))
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
User-mode-linux-user mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-user
