summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorKirill A. Shutemov <k.shutemov@gmail.com>2008-02-07 00:15:55 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-07 08:42:30 -0800
commit6cc931b9b5ec652c90b928f3ec2163f261552c91 (patch)
tree0f01557ada755c56baffe102614149ad190ebb02 /include
parent516c25a86f6bdad77ded01a43c52c5569c8d690c (diff)
downloadlinux-6cc931b9b5ec652c90b928f3ec2163f261552c91.tar.gz
linux-6cc931b9b5ec652c90b928f3ec2163f261552c91.tar.bz2
linux-6cc931b9b5ec652c90b928f3ec2163f261552c91.zip
Unexport asm/elf.h
Do not export asm/elf.h during make headers_install. Signed-off-by: Kirill A. Shutemov <k.shutemov@gmail.com> Reviewed-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
-rw-r--r--include/asm-generic/Kbuild.asm1
-rw-r--r--include/linux/Kbuild2
-rw-r--r--include/linux/elf.h2
-rw-r--r--include/linux/elfcore.h2
4 files changed, 5 insertions, 2 deletions
diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm
index 1f8c3df1c26d..d00fd67e6367 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 6723bc973dac..0d4f55d97ae9 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 7ceb24d87c1a..ed98c761bae7 100644
--- a/include/linux/elf.h
+++ b/include/linux/elf.h
@@ -3,7 +3,9 @@
#include <linux/types.h>
#include <linux/elf-em.h>
+#ifdef __KERNEL__
#include <asm/elf.h>
+#endif
struct file;
diff --git a/include/linux/elfcore.h b/include/linux/elfcore.h
index 0432de7d4707..5ca54d77079f 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 <asm/elf.h>
+#endif
#ifndef __KERNEL__
typedef elf_greg_t greg_t;