From patchwork Wed Mar 19 19:29:58 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 3860851 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 7E5F09F373 for ; Wed, 19 Mar 2014 19:45:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6E09F201F9 for ; Wed, 19 Mar 2014 19:45:05 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 80F99201F4 for ; Wed, 19 Mar 2014 19:45:04 +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 1WQMNU-00065k-W3; Wed, 19 Mar 2014 19:42:19 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WQMMR-0006OT-J4; Wed, 19 Mar 2014 19:41:11 +0000 Received: from moutng.kundenserver.de ([212.227.17.24]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WQMHX-00060C-Sm for linux-arm-kernel@lists.infradead.org; Wed, 19 Mar 2014 19:36:12 +0000 Received: from wuerfel.lan (HSI-KBW-134-3-135-108.hsi14.kabel-badenwuerttemberg.de [134.3.135.108]) by mrelayeu.kundenserver.de (node=mreue105) with ESMTP (Nemesis) id 0MWzzA-1WeXeJ0BLo-00VwSQ; Wed, 19 Mar 2014 20:35:47 +0100 From: Arnd Bergmann To: arm@kernel.org Subject: [PATCH 61/62] ARM: sunxi: fix build for THUMB2_KERNEL Date: Wed, 19 Mar 2014 20:29:58 +0100 Message-Id: <1395257399-359545-62-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1395257399-359545-1-git-send-email-arnd@arndb.de> References: <1395257399-359545-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:yi77h4eKIr0zJksWQu/MI1pkq4e/RCZEXRZALyalGYK Qrk9syKUIyck+x3u1VoznmHKMTCZUyndPmd2BVw74g80dn9cRV HL8W53ZXRanivaT8886QwDZzz+p29u/M0R5harWJmzE2O2nDTl PwVh9FYVXqXSa8AkAMijwiYVsvLwRT+wFjWKkZyzeGdmytNQNw 646SS8Wh3pY/YGcdVB6BX4a6+Tqg4RT2Cxkesw9dQAK3EuytuW CMmrfofzBd6doJyyG0rE9p0i96a6Oz9J3xZN3CDGzW1AnRQVE8 8K7wT4D9i8k7rby8VgaJ84Hu8wKD2NoVkC6EhKEmJf+sCjmE9I ax2D9hiMkzLPuED1ZJOvYgm9MJmj6XenRwglzZBhX X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140319_153608_428226_29D775F1 X-CRM114-Status: UNSURE ( 9.68 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) Cc: Maxime Ripard , Arnd Bergmann , linux-arm-kernel@lists.infradead.org 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: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_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 Building an SMP kernel for the sunxi platform with THUMB2 instructions fails with this error at the moment: headsmp.S:7: Error: Thumb encoding does not support an immediate here -- `msr cpsr_fsxc,#0xd3' This changes the code to use a register for loading the value instead, which works in both ARM and THUMB mode. Signed-off-by: Arnd Bergmann Cc: Maxime Ripard --- arch/arm/mach-sunxi/headsmp.S | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-sunxi/headsmp.S b/arch/arm/mach-sunxi/headsmp.S index a10d494..a8e0fef 100644 --- a/arch/arm/mach-sunxi/headsmp.S +++ b/arch/arm/mach-sunxi/headsmp.S @@ -4,6 +4,7 @@ .section ".text.head", "ax" ENTRY(sun6i_secondary_startup) - msr cpsr_fsxc, #0xd3 + mov r0, #0xd3 + msr cpsr_fsxc, r0 b secondary_startup ENDPROC(sun6i_secondary_startup)