Received: by 2002:ac0:946b:0:0:0:0:0 with SMTP id j40csp4237324imj; Tue, 12 Feb 2019 12:12:42 -0800 (PST) X-Google-Smtp-Source: AHgI3IZ5MYHrf4Fp/Ue8JwEvhe1XMciX6oR7ULriflPZGMdfANuSOZ/vdIbPUJkCla+i0sUb/OEJ X-Received: by 2002:a62:5c1:: with SMTP id 184mr5576522pff.165.1550002362416; Tue, 12 Feb 2019 12:12:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550002362; cv=none; d=google.com; s=arc-20160816; b=mbdcesrGCxNbDzvS6TA1z0LKr5FS8r3PMz8wwl9q8dEiUnS+Y3T0V3HYUaRJuFX0lP 3oyo09PvJjd5dgogn0im/aahPdWnwQ10vCIdCg2S5eOwnyBRhG3syutPNtbzfJiDOrbJ 8kD0Nqj84W+RFNXldy4HxcXjLqMKakEbY57aNIu8xShR90WYJss3Xm24rfDxabwlhdVD GU4C6tTsPDRlWYwo05u502LqG+2+HLO7QhYEjC20j+A2T0Bu07XNovfNfow6uTs2eQ6g Oxr98RYc6T5v/fIBqflkauNd8JEsrX4nENTeLuPE83D9UdCD++k5PO7rXzDST3H3byqP OXEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=+otpItkdVINRxREVjIjcvXRSrB+xmjGsSz9hu8CUyGI=; b=G0FiVw7O4ayc1NMOpSUNl99sQTCI56nID2rYTByly23tUJhsbeTHw68nGhEp09H19L DruqPdCgb3zYMR9sJ89X04X5dwe7+uhVSBpZGp05eeYMJ6SxR9Fhs8rtg3aCjPSZexg7 iuH8VKEHQydXlfUgDsK8S4p2PrkOaOHrFzqLnbQGvMwMAWGte6nIT1D5bm0DDi0idek8 4EMS5E1vl+SqdkMT3VIxJbJf2EhnsWxGmbMgRaGGRxNfcD6eu/gkVRzVAq5uWWVRAtNG HPJBjzH5opZ3ss2Jk9zU23BssN0dRdhUeewkrkJ49tI6Rob2zCadEb3mnfV4Mn6dpcD5 fVyg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@agner.ch header.s=dkim header.b=vAXfe5fx; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g187si13462199pfc.43.2019.02.12.12.12.25; Tue, 12 Feb 2019 12:12:42 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@agner.ch header.s=dkim header.b=vAXfe5fx; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731053AbfBLUCA (ORCPT + 99 others); Tue, 12 Feb 2019 15:02:00 -0500 Received: from mail.kmu-office.ch ([178.209.48.109]:43768 "EHLO mail.kmu-office.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729539AbfBLUB7 (ORCPT ); Tue, 12 Feb 2019 15:01:59 -0500 Received: from zyt.lan (unknown [IPv6:2a02:169:34b6::564]) by mail.kmu-office.ch (Postfix) with ESMTPSA id BA80B5C098D; Tue, 12 Feb 2019 21:01:57 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=agner.ch; s=dkim; t=1550001717; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+otpItkdVINRxREVjIjcvXRSrB+xmjGsSz9hu8CUyGI=; b=vAXfe5fxOMc5XlqC/JDbGJZVPDpiPdCnWX5bnYENAEO0GPQmIdxI+wf5geOlVpsSnsUyAl ok5XW5ceGh1CX8aXt1FhnUAws9jRp1LDNem8JxelDDE82Td7jiMuTuO0LVe/Uunol86v1b +Au9tJEtYE3LmDpX0MIa4k7J3Z8khQ8= From: Stefan Agner To: linux@armlinux.org.uk Cc: ndesaulniers@google.com, natechancellor@gmail.com, arnd@arndb.de, ard.biesheuvel@linaro.org, nicolas.pitre@linaro.org, thierry.reding@gmail.com, will.deacon@arm.com, julien.thierry@arm.com, mark.rutland@arm.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Stefan Agner , Nicolas Pitre Subject: [PATCH v3 1/5] ARM: use unified assembler in macros Date: Tue, 12 Feb 2019 21:01:57 +0100 Message-Id: X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use unified assembler syntax (UAL) in macros. Divided syntax is considered deprecated. This will also allow to build the kernel using LLVM's integrated assembler. Signed-off-by: Stefan Agner Acked-by: Nicolas Pitre --- Changes in v2: - Remove excessive null tokens arch/arm/lib/copy_from_user.S | 2 +- arch/arm/lib/copy_to_user.S | 2 +- arch/arm/lib/memcpy.S | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/lib/copy_from_user.S b/arch/arm/lib/copy_from_user.S index 0d4c189c7f4f..6a3419e2c6d8 100644 --- a/arch/arm/lib/copy_from_user.S +++ b/arch/arm/lib/copy_from_user.S @@ -91,7 +91,7 @@ .endm .macro str1b ptr reg cond=al abort - str\cond\()b \reg, [\ptr], #1 + strb\cond \reg, [\ptr], #1 .endm .macro enter reg1 reg2 diff --git a/arch/arm/lib/copy_to_user.S b/arch/arm/lib/copy_to_user.S index 97a6ff4b7e3c..c7d08096e354 100644 --- a/arch/arm/lib/copy_to_user.S +++ b/arch/arm/lib/copy_to_user.S @@ -49,7 +49,7 @@ .endm .macro ldr1b ptr reg cond=al abort - ldr\cond\()b \reg, [\ptr], #1 + ldrb\cond \reg, [\ptr], #1 .endm #ifdef CONFIG_CPU_USE_DOMAINS diff --git a/arch/arm/lib/memcpy.S b/arch/arm/lib/memcpy.S index 64111bd4440b..4a6997bb4404 100644 --- a/arch/arm/lib/memcpy.S +++ b/arch/arm/lib/memcpy.S @@ -30,7 +30,7 @@ .endm .macro ldr1b ptr reg cond=al abort - ldr\cond\()b \reg, [\ptr], #1 + ldrb\cond \reg, [\ptr], #1 .endm .macro str1w ptr reg abort @@ -42,7 +42,7 @@ .endm .macro str1b ptr reg cond=al abort - str\cond\()b \reg, [\ptr], #1 + strb\cond \reg, [\ptr], #1 .endm .macro enter reg1 reg2 -- 2.20.1