From 6cc931b9b5ec652c90b928f3ec2163f261552c91 Mon Sep 17 00:00:00 2001 From: "Kirill A. Shutemov" Date: Thu, 7 Feb 2008 00:15:55 -0800 Subject: Unexport asm/elf.h Do not export asm/elf.h during make headers_install. Signed-off-by: Kirill A. Shutemov Reviewed-by: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- include/asm-generic/Kbuild.asm | 1 - include/linux/Kbuild | 2 +- include/linux/elf.h | 2 ++ include/linux/elfcore.h | 2 ++ 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm index 1f8c3df1c26..d00fd67e636 100644 --- a/include/asm-generic/Kbuild.asm +++ b/include/asm-generic/Kbuild.asm @@ -29,5 +29,4 @@ unifdef-y += types.h unifdef-y += unistd.h # These probably shouldn't be exported -unifdef-y += elf.h unifdef-y += page.h diff --git a/include/linux/Kbuild b/include/linux/Kbuild index 6723bc973da..0d4f55d97ae 100644 --- a/include/linux/Kbuild +++ b/include/linux/Kbuild @@ -60,7 +60,6 @@ header-y += dqblk_v2.h header-y += dqblk_xfs.h header-y += efs_fs_sb.h header-y += elf-fdpic.h -header-y += elf.h header-y += elf-em.h header-y += fadvise.h header-y += fd.h @@ -190,6 +189,7 @@ unifdef-y += dccp.h unifdef-y += dirent.h unifdef-y += dlm.h unifdef-y += edd.h +unifdef-y += elf.h unifdef-y += elfcore.h unifdef-y += errno.h unifdef-y += errqueue.h diff --git a/include/linux/elf.h b/include/linux/elf.h index 7ceb24d87c1..ed98c761bae 100644 --- a/include/linux/elf.h +++ b/include/linux/elf.h @@ -3,7 +3,9 @@ #include #include +#ifdef __KERNEL__ #include +#endif struct file; diff --git a/include/linux/elfcore.h b/include/linux/elfcore.h index 0432de7d470..5ca54d77079 100644 --- a/include/linux/elfcore.h +++ b/include/linux/elfcore.h @@ -16,7 +16,9 @@ struct elf_siginfo int si_errno; /* errno */ }; +#ifdef __KERNEL__ #include +#endif #ifndef __KERNEL__ typedef elf_greg_t greg_t; -- cgit v1.2.3