The patch titled Fix 'make headers_check' on i386 has been added to the -mm tree. Its filename is fix-make-headers_check-on-i386-for-2618.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: Fix 'make headers_check' on i386 From: David Woodhouse <dwmw2@xxxxxxxxxxxxx> This brings i386 asm/unistd.h into consistency with other architectures by not exporting functionality which is not necessary. Signed-off-by: David Woodhouse <dwmw2@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- include/asm-i386/unistd.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN include/asm-i386/unistd.h~fix-make-headers_check-on-i386-for-2618 include/asm-i386/unistd.h --- a/include/asm-i386/unistd.h~fix-make-headers_check-on-i386-for-2618 +++ a/include/asm-i386/unistd.h @@ -324,6 +324,8 @@ #define __NR_vmsplice 316 #define __NR_move_pages 317 +#ifdef __KERNEL__ + #define NR_syscalls 318 /* @@ -423,8 +425,6 @@ __asm__ volatile ("push %%ebp ; push %%e __syscall_return(type,__res); \ } -#ifdef __KERNEL__ - #define __ARCH_WANT_IPC_PARSE_VERSION #define __ARCH_WANT_OLD_READDIR #define __ARCH_WANT_OLD_STAT _ Patches currently in -mm which might be from dwmw2@xxxxxxxxxxxxx are headers_check-improve-include-regexp.patch headers_check-clarify-error-message.patch headers_check-reduce-user-visible-noise-in-linux-nfs_fsh.patch headers_check-remove-asm-timexh-from-user-export.patch headers_check-move-inclusion-of-linux-linkageh-in.patch headers_check-move-kernel-only-includes-within-asm-i386-elfh.patch headers_check-dont-expose-pfn-stuff-to-userspace-in.patch headers_check-fix-userspace-build-of-asm-mips-pageh.patch fix-make-headers_check-on-biarch-architectures-for.patch fix-make-headers_check-on-s390-for-2618.patch fix-make-headers_check-on-ia64-for-2618.patch fix-make-headers_check-on-x86_64-for-2618.patch fix-make-headers_check-on-i386-for-2618.patch arm-make-headers_check.patch fix-make-headers_check-for-alpha-in-2618.patch fix-make-headers_check-for-parisc-in-2618.patch git-gfs2.patch git-mtd.patch mtd-maps-ixp4xx-partition-parsing.patch fix-the-unlock-addr-lookup-bug-in-mtd-jedec-probe.patch mtd-printk-format-warning.patch fs-jffs2-jffs2_fs_ih-removal-of-old-code.patch drivers-mtd-nand-au1550ndc-removal-of-old-code.patch pci-quirks-update.patch split-i386-and-x86_64-ptraceh.patch split-i386-and-x86_64-ptraceh-fix.patch make-uml-use-ptrace-abih.patch fs-conversions-from-kmallocmemset-to-kzcalloc.patch linux-magich-for-magic-numbers-headers_install-fix.patch the-scheduled-removal-of-some-oss-drivers-fix-fix.patch debug-shared-irqs.patch debug-shared-irqs-kconfig-fix.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