Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1209093 > unrolled thread
| Started by | Mike Frysinger <vapier@gentoo.org> |
|---|---|
| First post | 2015-08-18 09:30 +0200 |
| Last post | 2015-08-19 13:10 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH] elf-em.h: move EM_MICROBLAZE to the common header Mike Frysinger <vapier@gentoo.org> - 2015-08-18 09:30 +0200
Re: [PATCH] elf-em.h: move EM_MICROBLAZE to the common header Michal Simek <monstr@monstr.eu> - 2015-08-19 13:10 +0200
| From | Mike Frysinger <vapier@gentoo.org> |
|---|---|
| Date | 2015-08-18 09:30 +0200 |
| Subject | [PATCH] elf-em.h: move EM_MICROBLAZE to the common header |
| Message-ID | <pYJvk-7LF-23@gated-at.bofh.it> |
The linux/audit.h header uses EM_MICROBLAZE in order to define AUDIT_ARCH_MICROBLAZE, but it's only available in the microblaze asm headers. Move it to the common elf-em.h header so that the define can be used on non-microblaze systems. Otherwise we get build errors that EM_MICROBLAZE isn't defined when we try to use the AUDIT_ARCH_MICROBLAZE symbol. Signed-off-by: Mike Frysinger <vapier@gentoo.org> --- arch/microblaze/include/uapi/asm/elf.h | 3 ++- include/uapi/linux/elf-em.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/microblaze/include/uapi/asm/elf.h b/arch/microblaze/include/uapi/asm/elf.h index be1731d..e9bcdb6 100644 --- a/arch/microblaze/include/uapi/asm/elf.h +++ b/arch/microblaze/include/uapi/asm/elf.h @@ -11,12 +11,13 @@ #ifndef _UAPI_ASM_MICROBLAZE_ELF_H #define _UAPI_ASM_MICROBLAZE_ELF_H +#include <linux/elf-em.h> + /* * Note there is no "official" ELF designation for Microblaze. * I've snaffled the value from the microblaze binutils source code * /binutils/microblaze/include/elf/microblaze.h */ -#define EM_MICROBLAZE 189 #define EM_MICROBLAZE_OLD 0xbaab #define ELF_ARCH EM_MICROBLAZE diff --git a/include/uapi/linux/elf-em.h b/include/uapi/linux/elf-em.h index b088296..8c90a79 100644 --- a/include/uapi/linux/elf-em.h +++ b/include/uapi/linux/elf-em.h @@ -38,6 +38,7 @@ #define EM_ALTERA_NIOS2 113 /* Altera Nios II soft-core processor */ #define EM_TI_C6000 140 /* TI C6X DSPs */ #define EM_AARCH64 183 /* ARM 64 bit */ +#define EM_MICROBLAZE 189 /* Xilinx MicroBlaze */ #define EM_FRV 0x5441 /* Fujitsu FR-V */ #define EM_AVR32 0x18ad /* Atmel AVR32 */ -- 2.4.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[toc] | [next] | [standalone]
| From | Michal Simek <monstr@monstr.eu> |
|---|---|
| Date | 2015-08-19 13:10 +0200 |
| Message-ID | <pZ9pM-45B-5@gated-at.bofh.it> |
| In reply to | #1209093 |
[Multipart message — attachments visible in raw view] — view raw
On 08/18/2015 09:28 AM, Mike Frysinger wrote: > The linux/audit.h header uses EM_MICROBLAZE in order to define > AUDIT_ARCH_MICROBLAZE, but it's only available in the microblaze > asm headers. Move it to the common elf-em.h header so that the > define can be used on non-microblaze systems. Otherwise we get > build errors that EM_MICROBLAZE isn't defined when we try to use > the AUDIT_ARCH_MICROBLAZE symbol. > > Signed-off-by: Mike Frysinger <vapier@gentoo.org> > --- > arch/microblaze/include/uapi/asm/elf.h | 3 ++- > include/uapi/linux/elf-em.h | 1 + > 2 files changed, 3 insertions(+), 1 deletion(-) > > diff --git a/arch/microblaze/include/uapi/asm/elf.h b/arch/microblaze/include/uapi/asm/elf.h > index be1731d..e9bcdb6 100644 > --- a/arch/microblaze/include/uapi/asm/elf.h > +++ b/arch/microblaze/include/uapi/asm/elf.h > @@ -11,12 +11,13 @@ > #ifndef _UAPI_ASM_MICROBLAZE_ELF_H > #define _UAPI_ASM_MICROBLAZE_ELF_H > > +#include <linux/elf-em.h> > + > /* > * Note there is no "official" ELF designation for Microblaze. > * I've snaffled the value from the microblaze binutils source code > * /binutils/microblaze/include/elf/microblaze.h > */ > -#define EM_MICROBLAZE 189 > #define EM_MICROBLAZE_OLD 0xbaab > #define ELF_ARCH EM_MICROBLAZE > > diff --git a/include/uapi/linux/elf-em.h b/include/uapi/linux/elf-em.h > index b088296..8c90a79 100644 > --- a/include/uapi/linux/elf-em.h > +++ b/include/uapi/linux/elf-em.h > @@ -38,6 +38,7 @@ > #define EM_ALTERA_NIOS2 113 /* Altera Nios II soft-core processor */ > #define EM_TI_C6000 140 /* TI C6X DSPs */ > #define EM_AARCH64 183 /* ARM 64 bit */ > +#define EM_MICROBLAZE 189 /* Xilinx MicroBlaze */ > #define EM_FRV 0x5441 /* Fujitsu FR-V */ > #define EM_AVR32 0x18ad /* Atmel AVR32 */ > > Applied. We should probably also remove EM_MICROBLAZE_OLD which shouldn't be used now. Thanks, Michal -- Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/ Maintainer of Linux kernel - Xilinx Zynq ARM architecture Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web