From patchwork Thu Dec 24 14:00:56 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivaylo Dimitrov X-Patchwork-Id: 7917991 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 3B60E9F32E for ; Thu, 24 Dec 2015 14:02:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 65B552060D for ; Thu, 24 Dec 2015 14:02:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 74ED320608 for ; Thu, 24 Dec 2015 14:02:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754300AbbLXOCA (ORCPT ); Thu, 24 Dec 2015 09:02:00 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:33441 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752449AbbLXOB0 (ORCPT ); Thu, 24 Dec 2015 09:01:26 -0500 Received: by mail-wm0-f65.google.com with SMTP id u188so15646132wmu.0; Thu, 24 Dec 2015 06:01:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Vig+LFQdMH46KoIGE6vJFu7/7ONT4tFbWgxBwkSXjAw=; b=biTNiwm9MrgQZLIk/c1ghZe1vkZm7IGjkxzCx6nzB+sXwx/VkXcJXpSZeh4XpV0Mz8 L8Ev33yMRvtFjBm0iispovezNv9UEz9OslDhq/cJl8zXVq5xIVYWDmysXxyoFCBmoQT/ 7TWVaEL4swTb9SIYSsXUbLYuCOM9N84TjdsgE8bQHaN75DydDYKURBgKWGK9yIaueY2p aK1w7fBNntFV/xD3e1FSN3Dw7PX6O1/B2G3t/l/pJajDoUQzdvI1oaV3ARW5cRE1ZqDx a+TiS/YPeNH+ntr794Ndc1CVTyWjxjDO0CI5b799hjJ4CpM+mkmYgGonqNhAwAnKNL3f zlTQ== X-Received: by 10.194.192.198 with SMTP id hi6mr40367010wjc.141.1450965685139; Thu, 24 Dec 2015 06:01:25 -0800 (PST) Received: from localhost.localdomain ([46.249.74.23]) by smtp.gmail.com with ESMTPSA id wf8sm9442165wjb.45.2015.12.24.06.01.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 24 Dec 2015 06:01:24 -0800 (PST) From: Ivaylo Dimitrov To: linux@arm.linux.org.uk, tony@atomide.com, nicolas.pitre@linaro.org, arnd@arndb.de, pali.rohar@gmail.com Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, Ivaylo Dimitrov Subject: [PATCH 1/3] ARM: ATAGS: move atags.h to include/asm so it can be included by files outside kernel/ Date: Thu, 24 Dec 2015 16:00:56 +0200 Message-Id: <1450965658-2675-2-git-send-email-ivo.g.dimitrov.75@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1450965658-2675-1-git-send-email-ivo.g.dimitrov.75@gmail.com> References: <1450965658-2675-1-git-send-email-ivo.g.dimitrov.75@gmail.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This is needed by a follow-up patch that saves atags on RX51 device Signed-off-by: Ivaylo Dimitrov --- arch/arm/include/asm/atags.h | 20 ++++++++++++++++++++ arch/arm/kernel/atags.h | 20 -------------------- arch/arm/kernel/atags_parse.c | 3 +-- arch/arm/kernel/setup.c | 3 +-- 4 files changed, 22 insertions(+), 24 deletions(-) create mode 100644 arch/arm/include/asm/atags.h delete mode 100644 arch/arm/kernel/atags.h diff --git a/arch/arm/include/asm/atags.h b/arch/arm/include/asm/atags.h new file mode 100644 index 0000000..ec4164d --- /dev/null +++ b/arch/arm/include/asm/atags.h @@ -0,0 +1,20 @@ +#ifdef CONFIG_ATAGS_PROC +extern void save_atags(struct tag *tags); +#else +static inline void save_atags(struct tag *tags) { } +#endif + +void convert_to_tag_list(struct tag *tags); + +#ifdef CONFIG_ATAGS +const struct machine_desc *setup_machine_tags(phys_addr_t __atags_pointer, + unsigned int machine_nr); +#else +static inline const struct machine_desc * +setup_machine_tags(phys_addr_t __atags_pointer, unsigned int machine_nr) +{ + early_print("no ATAGS support: can't continue\n"); + while (true); + unreachable(); +} +#endif diff --git a/arch/arm/kernel/atags.h b/arch/arm/kernel/atags.h deleted file mode 100644 index ec4164d..0000000 --- a/arch/arm/kernel/atags.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifdef CONFIG_ATAGS_PROC -extern void save_atags(struct tag *tags); -#else -static inline void save_atags(struct tag *tags) { } -#endif - -void convert_to_tag_list(struct tag *tags); - -#ifdef CONFIG_ATAGS -const struct machine_desc *setup_machine_tags(phys_addr_t __atags_pointer, - unsigned int machine_nr); -#else -static inline const struct machine_desc * -setup_machine_tags(phys_addr_t __atags_pointer, unsigned int machine_nr) -{ - early_print("no ATAGS support: can't continue\n"); - while (true); - unreachable(); -} -#endif diff --git a/arch/arm/kernel/atags_parse.c b/arch/arm/kernel/atags_parse.c index 68c6ae0..faac2d1 100644 --- a/arch/arm/kernel/atags_parse.c +++ b/arch/arm/kernel/atags_parse.c @@ -28,8 +28,7 @@ #include #include #include - -#include "atags.h" +#include static char default_command_line[COMMAND_LINE_SIZE] __initdata = CONFIG_CMDLINE; diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index 20edd34..aa0193a 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c @@ -60,8 +60,7 @@ #include #include #include - -#include "atags.h" +#include #if defined(CONFIG_FPE_NWFPE) || defined(CONFIG_FPE_FASTFPE)