Do not export asm/elf.h during make headers_install.
Signed-off-by: Kirill A. Shutemov <[email protected]>
Reviewed-By: David Woodhouse <[email protected]>
---
include/asm-generic/Kbuild.asm | 3 ---
include/linux/Kbuild | 2 +-
include/linux/elf.h | 2 ++
include/linux/elfcore.h | 2 ++
4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm
index a10583a..d744ee3 100644
--- a/include/asm-generic/Kbuild.asm
+++ b/include/asm-generic/Kbuild.asm
@@ -28,6 +28,3 @@ unifdef-y += termios.h
unifdef-y += types.h
unifdef-y += unistd.h
unifdef-y += user.h
-
-# These probably shouldn't be exported
-unifdef-y += elf.h
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index e91eb43..c482561 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -57,7 +57,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
@@ -188,6 +187,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 576e83b..3fad88b 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 9631ddd..e227719 100644
--- a/include/linux/elfcore.h
+++ b/include/linux/elfcore.h
@@ -14,7 +14,9 @@ struct elf_siginfo
int si_errno; /* errno */
};
+#ifdef __KERNEL__
#include <asm/elf.h>
+#endif
#ifndef __KERNEL__
typedef elf_greg_t greg_t;
--
1.5.3.4.GIT
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
