Re: [uml-devel] missing asm/user.h

[Jeff Dike <jdike@addtoit.com>]

On Sat, Mar 24, 2007 at 03:33:56PM -0400, Daniel Gryniewicz wrote:
> In their infinite wisdom, the Gentoo kernel team has decided to not ship
> asm/user.h with the kernel headers package anymore.  Since UML (even, as
> far as I can tell, in the most recent versions) uses this in several
> places, is there a way around this?  Are there plans to remove this
> need, or to use the ones from the UML kernel tree, or something?

This came up on IRC a week or so ago, but the conclusion then was that
this was a botch on their part since other distro headers still
included it, and became unusable as a result.

BTW, several of the occurrences are in kernelspace files, which aren't
affected by distro libc burps.

I have a patch ready in case this is for real, attached below.  It
takes care of the i386 side of things - there's an x86_64 include
which I ignored for now.

Do you believe that this is going to be permanent, or just a gyration
in the Gentoo kernel package?

				Jeff

-- 
Work email - jdike at linux dot intel dot com

Index: linux-2.6.21-mm/arch/um/sys-i386/user-offsets.c
===================================================================
--- linux-2.6.21-mm.orig/arch/um/sys-i386/user-offsets.c	2007-03-23 15:05:29.000000000 -0400
+++ linux-2.6.21-mm/arch/um/sys-i386/user-offsets.c	2007-03-24 21:18:44.000000000 -0400
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <signal.h>
 #include <asm/ptrace.h>
-#include <asm/user.h>
+#include <asm/elf.h>
 #include <stddef.h>
 #include <sys/poll.h>
 
Index: linux-2.6.21-mm/arch/um/sys-i386/ptrace_user.c
===================================================================
--- linux-2.6.21-mm.orig/arch/um/sys-i386/ptrace_user.c	2007-03-24 21:18:44.000000000 -0400
+++ linux-2.6.21-mm/arch/um/sys-i386/ptrace_user.c	2007-03-24 21:20:44.000000000 -0400
@@ -8,8 +8,6 @@
 #include <errno.h>
 #include <unistd.h>
 #include "ptrace_user.h"
-/* Grr, asm/user.h includes asm/ptrace.h, so has to follow ptrace_user.h */
-#include <asm/user.h>
 #include "kern_util.h"
 #include "sysdep/thread.h"
 #include "user.h"

-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel