Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934219AbbENP1p (ORCPT ); Thu, 14 May 2015 11:27:45 -0400 Received: from mail-wi0-f175.google.com ([209.85.212.175]:33319 "EHLO mail-wi0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933697AbbENP1b (ORCPT ); Thu, 14 May 2015 11:27:31 -0400 From: Rabin Vincent To: jesper.nilsson@axis.com Cc: linux-kernel@vger.kernel.org, linux-cris-kernel@axis.com, Rabin Vincent Subject: [PATCH 3/3] CRIS: UAPI: fix elf.h export Date: Thu, 14 May 2015 17:26:52 +0200 Message-Id: <1431617212-9093-3-git-send-email-rabin@rab.in> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1431617212-9093-1-git-send-email-rabin@rab.in> References: <1431617212-9093-1-git-send-email-rabin@rab.in> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2384 Lines: 65 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 --- arch/cris/include/uapi/asm/Kbuild | 3 +++ arch/cris/include/{ => uapi}/asm/elf.h | 6 +++++- arch/cris/include/{arch-v10/arch/elf.h => uapi/asm/elf_v10.h} | 0 arch/cris/include/{arch-v32/arch/elf.h => uapi/asm/elf_v32.h} | 0 4 files changed, 8 insertions(+), 1 deletion(-) rename arch/cris/include/{ => uapi}/asm/elf.h (97%) rename arch/cris/include/{arch-v10/arch/elf.h => uapi/asm/elf_v10.h} (100%) rename arch/cris/include/{arch-v32/arch/elf.h => uapi/asm/elf_v32.h} (100%) diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild index 8443dc8..d5564a0 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 similarity index 97% rename from arch/cris/include/asm/elf.h rename to arch/cris/include/uapi/asm/elf.h index 986adba..a5df05b 100644 --- a/arch/cris/include/asm/elf.h +++ b/arch/cris/include/uapi/asm/elf.h @@ -5,7 +5,11 @@ * ELF register definitions.. */ -#include +#ifdef __arch_v32 +#include +#else +#include +#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 similarity index 100% rename from arch/cris/include/arch-v10/arch/elf.h rename to 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 similarity index 100% rename from arch/cris/include/arch-v32/arch/elf.h rename to arch/cris/include/uapi/asm/elf_v32.h -- 2.1.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/