The patch titled uml: remove include of asm/user.h has been removed from the -mm tree. Its filename was uml-remove-include-of-asm-userh.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: uml: remove include of asm/user.h From: Jeff Dike <jdike@xxxxxxxxxxx> I allowed an include of asm/user.h to sneak back in. This patch replaces it with sys/user.h. Signed-off-by: Jeff Dike <jdike@xxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/um/os-Linux/sys-i386/registers.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN arch/um/os-Linux/sys-i386/registers.c~uml-remove-include-of-asm-userh arch/um/os-Linux/sys-i386/registers.c --- a/arch/um/os-Linux/sys-i386/registers.c~uml-remove-include-of-asm-userh +++ a/arch/um/os-Linux/sys-i386/registers.c @@ -6,7 +6,7 @@ #include <errno.h> #include <sys/ptrace.h> -#include <asm/user.h> +#include <sys/user.h> #include "kern_constants.h" #include "longjmp.h" #include "user.h" @@ -76,7 +76,7 @@ int put_fp_registers(int pid, unsigned l void arch_init_registers(int pid) { - struct user_fxsr_struct fpx_regs; + struct user_fpxregs_struct fpx_regs; int err; err = ptrace(PTRACE_GETFPXREGS, pid, 0, &fpx_regs); _ Patches currently in -mm which might be from jdike@xxxxxxxxxxx are origin.patch linux-next.patch arch-um-kernel-irqc-clean-up-some-functions.patch arch-um-kernel-memc-remove-arch_validate.patch uml-make-several-more-things-static.patch kernel-call-constructors-uml-fix-1.patch kernel-call-constructors-uml-fix-2.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html