diff options
| author | Rabin Vincent <rabin@rab.in> | 2015-03-27 22:35:11 +0100 |
|---|---|---|
| committer | Jesper Nilsson <jespern@axis.com> | 2015-09-05 00:33:25 +0200 |
| commit | 2493d3e28a22087116158249d79410fd355d1e83 (patch) | |
| tree | 4a67f2aaf6b87ba3cad2fd6d12300aac618813d8 | |
| parent | CRIS: don't make asm/elf.h depend on asm/user.h (diff) | |
| download | linux-2493d3e28a22087116158249d79410fd355d1e83.tar.xz linux-2493d3e28a22087116158249d79410fd355d1e83.zip | |
CRIS: UAPI: fix elf.h export
CRIS userspace (uClibc for one) expects asm/elf.h to be exported but
this header appears to have gone missing at some point. Move it to
uapi/ and export it.
Signed-off-by: Rabin Vincent <rabin@rab.in>
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| -rw-r--r-- | arch/cris/include/uapi/asm/Kbuild | 3 | ||||
| -rw-r--r-- | arch/cris/include/uapi/asm/elf.h (renamed from arch/cris/include/asm/elf.h) | 6 | ||||
| -rw-r--r-- | arch/cris/include/uapi/asm/elf_v10.h (renamed from arch/cris/include/arch-v10/arch/elf.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/uapi/asm/elf_v32.h (renamed from arch/cris/include/arch-v32/arch/elf.h) | 0 |
4 files changed, 8 insertions, 1 deletions
diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild index 8443dc81f19b..d5564a0ae66a 100644 --- a/arch/cris/include/uapi/asm/Kbuild +++ b/arch/cris/include/uapi/asm/Kbuild @@ -6,6 +6,9 @@ header-y += ../arch-v32/arch/ header-y += auxvec.h header-y += bitsperlong.h header-y += byteorder.h +header-y += elf.h +header-y += elf_v10.h +header-y += elf_v32.h header-y += errno.h header-y += ethernet.h header-y += etraxgpio.h diff --git a/arch/cris/include/asm/elf.h b/arch/cris/include/uapi/asm/elf.h index 986adbabb581..a5df05bfee66 100644 --- a/arch/cris/include/asm/elf.h +++ b/arch/cris/include/uapi/asm/elf.h @@ -5,7 +5,11 @@ * ELF register definitions.. */ -#include <arch/elf.h> +#ifdef __arch_v32 +#include <asm/elf_v32.h> +#else +#include <asm/elf_v10.h> +#endif #define R_CRIS_NONE 0 #define R_CRIS_8 1 diff --git a/arch/cris/include/arch-v10/arch/elf.h b/arch/cris/include/uapi/asm/elf_v10.h index 3ea65cef529d..3ea65cef529d 100644 --- a/arch/cris/include/arch-v10/arch/elf.h +++ b/arch/cris/include/uapi/asm/elf_v10.h diff --git a/arch/cris/include/arch-v32/arch/elf.h b/arch/cris/include/uapi/asm/elf_v32.h index f09fe49005c0..f09fe49005c0 100644 --- a/arch/cris/include/arch-v32/arch/elf.h +++ b/arch/cris/include/uapi/asm/elf_v32.h |