[Jaswinder Singh Rajput - Mon, Feb 02, 2009 at 10:26:05PM +0530] | Ingo, | | The following changes since commit 1ff8f739c7cc4eaa89b6ba986494f458ff7bdbef: | Jaswinder Singh Rajput (1): | headers_check fix: xtensa, swab.h | | are available in the git repository at: | | git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6-tipclean.git core/header-fixes | | Jaswinder Singh Rajput (7): | headers_check fix: linux/coda_psdev.h | headers_check fix: linux/in6.h | headers_check fix: linux/nubus.h | headers_check fix: linux/socket.h | headers_check fix: linux/reinserfs_fs.h | headers_check fix: x86, prctl.h | headers_check fix: x86, setup.h | | arch/x86/include/asm/prctl.h | 6 +++- | arch/x86/include/asm/setup.h | 45 ++++++++++++++++++++--------------------- | include/linux/coda_psdev.h | 15 ++++++------- | include/linux/in6.h | 2 +- | include/linux/nubus.h | 2 + | include/linux/reiserfs_fs.h | 8 +++++++ | include/linux/socket.h | 6 +++- | 7 files changed, 48 insertions(+), 36 deletions(-) | ... | | Complete diff: | diff --git a/arch/x86/include/asm/prctl.h b/arch/x86/include/asm/prctl.h | index a889464..fdbeb85 100644 | --- a/arch/x86/include/asm/prctl.h | +++ b/arch/x86/include/asm/prctl.h | @@ -6,8 +6,10 @@ | #define ARCH_GET_FS 0x1003 | #define ARCH_GET_GS 0x1004 | | -#ifdef CONFIG_X86_64 | +#ifdef __KERNEL__ | +# ifdef CONFIG_X86_64 | extern long sys_arch_prctl(int, unsigned long); | -#endif /* CONFIG_X86_64 */ | +# endif /* CONFIG_X86_64 */ | +#endif /* __KERNEL__ */ | ... Hi Jaswinder, it seems we have a clash here :) I thought this part was just dropped out http://lkml.org/lkml/2009/1/14/461 and Peter had been applying it on tip:x86/header-fixes http://lkml.org/lkml/2009/1/14/549 but maybe it's just lost... -- Cyrill -- -- To unsubscribe from this list: send the line "unsubscribe reiserfs-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
