From patchwork Sat Dec 8 12:02:05 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Shiyan X-Patchwork-Id: 1852421 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 822D0DF23A for ; Sat, 8 Dec 2012 12:05:23 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1ThJ7Q-0003mX-Ee; Sat, 08 Dec 2012 12:02:56 +0000 Received: from smtp47.i.mail.ru ([94.100.177.107]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1ThJ7N-0003lm-1d for linux-arm-kernel@lists.infradead.org; Sat, 08 Dec 2012 12:02:53 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mail.ru; s=mail; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=Rj8wUQURit/eAUfHlFRO6ANP2bDLDyymZTff8kcCAiQ=; b=PEve7YaLIFbFef0y9HU52dirASw2HWSQyKbpjV7oyZG3xuijeYkj7dzEjijfWEBqzjGAwpQ1OemmHAWegozgVBkWL8RKFn6S+XRAE5lcv2RxLMulkuVa7hF1on5kgg5l; Received: from [188.134.40.128] (port=19751 helo=shc.zet) by smtp47.i.mail.ru with esmtpa (envelope-from ) id 1ThJ7K-0004L8-7O; Sat, 08 Dec 2012 16:02:50 +0400 From: Alexander Shiyan To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] ARM: Do not use definition "machine_arch_type" outside mach-types.h Date: Sat, 8 Dec 2012 16:02:05 +0400 Message-Id: <1354968125-664-1-git-send-email-shc_work@mail.ru> X-Mailer: git-send-email 1.7.8.6 In-Reply-To: <20121208112353.GD14363@n2100.arm.linux.org.uk> References: <20121208112353.GD14363@n2100.arm.linux.org.uk> X-Spam: Not detected X-Mras: Ok X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121208_070253_414512_14C6EDDD X-CRM114-Status: GOOD ( 10.86 ) X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (shc_work[at]mail.ru) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Russell King , Alexander Shiyan , Arnd Bergmann X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org This patch removes the use of the definition "machine_arch_type" outside mach-types.h file. Using variable "__machine_arch_type" that passed from the bootloader. Signed-off-by: Alexander Shiyan --- arch/arm/kernel/machine_kexec.c | 2 +- arch/arm/kernel/setup.c | 2 +- arch/arm/mach-pxa/em-x270.c | 2 +- arch/arm/tools/gen-mach-types | 3 --- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/arch/arm/kernel/machine_kexec.c b/arch/arm/kernel/machine_kexec.c index 8ef8c93..f154d6b 100644 --- a/arch/arm/kernel/machine_kexec.c +++ b/arch/arm/kernel/machine_kexec.c @@ -145,7 +145,7 @@ void machine_kexec(struct kimage *image) /* Prepare parameters for reboot_code_buffer*/ kexec_start_address = image->start; kexec_indirection_page = page_list; - kexec_mach_type = machine_arch_type; + kexec_mach_type = __machine_arch_type; if (!kexec_boot_atags) kexec_boot_atags = image->start - KEXEC_ARM_ZIMAGE_OFFSET + KEXEC_ARM_ATAGS_OFFSET; diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index 86d1429..95fcaa0 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c @@ -744,7 +744,7 @@ void __init setup_arch(char **cmdline_p) setup_processor(); mdesc = setup_machine_fdt(__atags_pointer); if (!mdesc) - mdesc = setup_machine_tags(__atags_pointer, machine_arch_type); + mdesc = setup_machine_tags(__atags_pointer, __machine_arch_type); machine_desc = mdesc; machine_name = mdesc->name; diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c index 1b64114..601ffc21 100644 --- a/arch/arm/mach-pxa/em-x270.c +++ b/arch/arm/mach-pxa/em-x270.c @@ -1273,7 +1273,7 @@ static void __init em_x270_init(void) else if (machine_is_exeda()) em_x270_exeda_init(); else - panic("Unsupported machine: %d\n", machine_arch_type); + panic("Unsupported machine: %d\n", __machine_arch_type); em_x270_init_da9030(); em_x270_init_dm9000(); diff --git a/arch/arm/tools/gen-mach-types b/arch/arm/tools/gen-mach-types index 04fef71..4a85086 100644 --- a/arch/arm/tools/gen-mach-types +++ b/arch/arm/tools/gen-mach-types @@ -65,8 +65,5 @@ END { printf("#define %s()\t(0)\n", machine_is[i]); } - printf("\n#ifndef machine_arch_type\n"); - printf("#define machine_arch_type\t__machine_arch_type\n"); - printf("#endif\n\n"); printf("#endif\n"); }