From patchwork Fri Jun 21 20:28:29 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 2764181 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 368A29F756 for ; Fri, 21 Jun 2013 20:29:17 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5400F201CD for ; Fri, 21 Jun 2013 20:29:16 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5519C201C3 for ; Fri, 21 Jun 2013 20:29:15 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Uq7xG-0008O1-7B; Fri, 21 Jun 2013 20:29:10 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Uq7xD-0004gq-H7; Fri, 21 Jun 2013 20:29:07 +0000 Received: from moutng.kundenserver.de ([212.227.17.9]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Uq7xA-0004gO-KI for linux-arm-kernel@lists.infradead.org; Fri, 21 Jun 2013 20:29:05 +0000 Received: from klappe2.localnet (HSI-KBW-095-208-002-043.hsi5.kabel-badenwuerttemberg.de [95.208.2.43]) by mrelayeu.kundenserver.de (node=mreu0) with ESMTP (Nemesis) id 0MRhPx-1UjqOP2RT7-00T319; Fri, 21 Jun 2013 22:28:40 +0200 From: Arnd Bergmann To: Santosh Shilimkar Subject: [PATCH] ARM: keystone: remove hand-coded smc instruction Date: Fri, 21 Jun 2013 22:28:29 +0200 User-Agent: KMail/1.12.2 (Linux/3.8.0-22-generic; KDE/4.3.2; x86_64; ; ) MIME-Version: 1.0 Message-Id: <201306212228.29717.arnd@arndb.de> X-Provags-ID: V02:K0:0wJm5IZSIeZzvAiMsFCxiqxUTDoLK0L0y8WYV1xcgK4 xs9kWVWAtZNvF0RmMXNb5OzIgpsf6oWE7XugG/LXJgYtAlMPP9 L2pLN9Y/b+2+ZjW81xfTRsdYRI1j1rpjIqnMukSsnYkh+hF8MX 1uD8pFq+hqkxQ4/NFiNPb5yXVoOyKeapqlXYa/Lsk5ylSi9/HD icc+7mzDoAm31aAAS7L2pRzx69wc92roLQg+ewB5IIpJ80xjHk Po3UuGtm4ypyMPHIAOyvIntkchlHnGTe6/H+qjmY8wU35G4nZ8 ybTljLnF0d9EeyKi000iwSLLfRV7Xm8rDMm6hx8z5Wqsh46DCv pgpLP+KpcFVsbvwVtLNc= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130621_162904_894304_6E547946 X-CRM114-Status: UNSURE ( 9.19 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) Cc: Linux ARM Kernel List X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, 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 lets us build keystone with CONFIG_THUMB2_KERNEL enabled, without the patch we get this error: Error: cannot determine Thumb instruction size. Use .inst.n/.inst.w instead This follows the same change for all other platforms done earlier. Signed-off-by: Arnd Bergmann Cc: Santosh Shilimkar diff --git a/arch/arm/mach-keystone/platsmp.c b/arch/arm/mach-keystone/platsmp.c index 630ab3bd..1800c33 100644 --- a/arch/arm/mach-keystone/platsmp.c +++ b/arch/arm/mach-keystone/platsmp.c @@ -34,7 +34,7 @@ static int __cpuinit keystone_smp_boot_secondary(unsigned int cpu, "mov r0, #0\n" /* power on cmd */ "mov r1, %1\n" /* cpu */ "mov r2, %2\n" /* start */ - ".inst 0xe1600070\n" /* smc #0 */ + "smc #0\n" /* smc #0 */ "mov %0, r0\n" : "=r" (error) : "r"(cpu), "r"(start)