From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934004AbbENP1h (ORCPT ); Thu, 14 May 2015 11:27:37 -0400 Received: from mail-wg0-f49.google.com ([74.125.82.49]:36420 "EHLO mail-wg0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933687AbbENP13 (ORCPT ); Thu, 14 May 2015 11:27:29 -0400 From: Rabin Vincent To: jesper.nilsson@axis.com Cc: linux-kernel@vger.kernel.org, linux-cris-kernel@axis.com, Rabin Vincent Subject: [PATCH 1/3] CRIS: UAPI: fix ptrace.h Date: Thu, 14 May 2015 17:26:50 +0200 Message-Id: <1431617212-9093-1-git-send-email-rabin@rab.in> X-Mailer: git-send-email 2.1.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The exported ptrace.h header on CRIS references an "arch" directory which does not exist. Fix this by having the variants in the same directory and including them conditionally, similar to other architectures. Signed-off-by: Rabin Vincent --- arch/cris/arch-v32/kernel/signal.c | 1 - arch/cris/include/arch-v32/arch/irqflags.h | 2 +- arch/cris/include/uapi/asm/Kbuild | 2 ++ arch/cris/include/uapi/asm/ptrace.h | 6 +++++- arch/cris/include/{arch-v10/arch/ptrace.h => uapi/asm/ptrace_v10.h} | 0 arch/cris/include/{arch-v32/arch/ptrace.h => uapi/asm/ptrace_v32.h} | 0 6 files changed, 8 insertions(+), 3 deletions(-) rename arch/cris/include/{arch-v10/arch/ptrace.h => uapi/asm/ptrace_v10.h} (100%) rename arch/cris/include/{arch-v32/arch/ptrace.h => uapi/asm/ptrace_v32.h} (100%) diff --git a/arch/cris/arch-v32/kernel/signal.c b/arch/cris/arch-v32/kernel/signal.c index 3a36ae6..150d1d7 100644 --- a/arch/cris/arch-v32/kernel/signal.c +++ b/arch/cris/arch-v32/kernel/signal.c @@ -19,7 +19,6 @@ #include #include #include -#include #include extern unsigned long cris_signal_return_page; diff --git a/arch/cris/include/arch-v32/arch/irqflags.h b/arch/cris/include/arch-v32/arch/irqflags.h index 041851f..5f6fddf 100644 --- a/arch/cris/include/arch-v32/arch/irqflags.h +++ b/arch/cris/include/arch-v32/arch/irqflags.h @@ -2,7 +2,7 @@ #define __ASM_CRIS_ARCH_IRQFLAGS_H #include -#include +#include static inline unsigned long arch_local_save_flags(void) { diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild index 01f66b8..8443dc8 100644 --- a/arch/cris/include/uapi/asm/Kbuild +++ b/arch/cris/include/uapi/asm/Kbuild @@ -19,6 +19,8 @@ header-y += param.h header-y += poll.h header-y += posix_types.h header-y += ptrace.h +header-y += ptrace_v10.h +header-y += ptrace_v32.h header-y += resource.h header-y += rs485.h header-y += sembuf.h diff --git a/arch/cris/include/uapi/asm/ptrace.h b/arch/cris/include/uapi/asm/ptrace.h index c689c9b..bd8946f 100644 --- a/arch/cris/include/uapi/asm/ptrace.h +++ b/arch/cris/include/uapi/asm/ptrace.h @@ -1 +1,5 @@ -#include +#ifdef __arch_v32 +#include +#else +#include +#endif diff --git a/arch/cris/include/arch-v10/arch/ptrace.h b/arch/cris/include/uapi/asm/ptrace_v10.h similarity index 100% rename from arch/cris/include/arch-v10/arch/ptrace.h rename to arch/cris/include/uapi/asm/ptrace_v10.h diff --git a/arch/cris/include/arch-v32/arch/ptrace.h b/arch/cris/include/uapi/asm/ptrace_v32.h similarity index 100% rename from arch/cris/include/arch-v32/arch/ptrace.h rename to arch/cris/include/uapi/asm/ptrace_v32.h -- 2.1.4