UML - stop using libc asm/user.h
PATCH 3/4 UML - stop using libc asm/user.h
commit 08b37a8744252a58766905f29b354a0e611dbdf4
Author: Jeff Dike <[email protected]> Date: Tue Oct 16 01:27:14 2007 -0700
uml: don't use glibc asm/user.h
Stop including asm/user.h from libc - 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.
--- arch/um/sys-i386/user-offsets.c | 6 +++--- arch/um/sys-x86_64/user-offsets.c | 9 +-------- 2 files changed, 4 insertions(+), 11 deletions(-)
arch/um/sys-i386/user-offsets.c +3 -3
@@ -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 );
arch/um/sys-x86_64/user-offsets.c +1 -8
@@ -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))
commit 2a772652c3971745228a2e40e6575ae594c88365
Author: Jeff Dike <[email protected]> Date: Tue Oct 16 01:26:45 2007 -0700
uml: fix an IPV6 libc vs kernel symbol clash
On some systems, with IPV6 configured, there is a clash between the kernel's in6addr_any and the one in libc.
This is handled in the usual (gross) way of defining the kernel symbol out of the way on the gcc command line.
arch/um/Makefile +2 -1
@@ -60,7 +60,8 @@ SYS_DIR := $(ARCH_DIR)/include/sysdep-$(SUBARCH) CFLAGS += $(CFLAGS-y) -D__arch_um__ -DSUBARCH=\"$(SUBARCH)\" \ $(ARCH_INCLUDE) $(MODE_INCLUDE) -Dvmap=kernel_vmap \ - -Din6addr_loopback=kernel_in6addr_loopback + -Din6addr_loopback=kernel_in6addr_loopback \ + -Din6addr_any=kernel_in6addr_any AFLAGS += $(ARCH_INCLUDE)
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
User-mode-linux-devel mailing list [email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
patch uml-stop-using-libc-asm-user.h.patch queued to -stable tree
This is a note to let you know that we have just queued up the patch titled
Subject: UML - stop using libc asm/user.h
to the 2.6.23-stable tree. Its filename is
uml-stop-using-libc-asm-user.h.patch
A git repo of this tree can be found at
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
From [email protected] Thu Nov 1 12:54:17 2007
From: Jeff Dike <[email protected]>
Date: Thu, 1 Nov 2007 15:53:26 -0400
Subject: UML - stop using libc asm/user.h
To: [email protected]
Cc: LKML <[email protected]>, uml-devel <[email protected]>
Message-ID: <[email protected]>
Content-Disposition: inline
From: Jeff Dike <[email protected]>
commit 189872f968def833727b6bfef83ebd7440c538e6 in mainline.
uml: don't use glibc asm/user.h
Stop including asm/user.h from libc - 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.
--- arch/um/sys-i386/user-offsets.c | 6 +++--- arch/um/sys-x86_64/user-offsets.c | 9 +-------- 2 files changed, 4 insertions(+), 11 deletions(-)
arch/um/sys-i386/user-offsets.c +3 -3
@@ -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 );
arch/um/sys-x86_64/user-offsets.c +1 -8
@@ -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))
Patches currently in stable-queue which might be from [email protected] are
queue-2.6.23/uml-stop-using-libc-asm-page.h.patch queue-2.6.23/uml-fix-kernel-vs-libc-symbols-clash.patch queue-2.6.23/uml-stop-using-libc-asm-user.h.patch
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
User-mode-linux-devel mailing list [email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel