From patchwork Tue Mar 22 11:59:29 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Abraham X-Patchwork-Id: 725 Return-Path: Delivered-To: unknown Received: from imap.gmail.com (74.125.159.109) by localhost6.localdomain6 with IMAP4-SSL; 08 Jun 2011 14:45:12 -0000 Delivered-To: patches@linaro.org Received: by 10.204.113.5 with SMTP id y5cs101688bkp; Tue, 22 Mar 2011 05:00:19 -0700 (PDT) Received: by 10.42.74.195 with SMTP id x3mr8933869icj.79.1300795218236; Tue, 22 Mar 2011 05:00:18 -0700 (PDT) Received: from mailout4.samsung.com (mailout4.samsung.com [203.254.224.34]) by mx.google.com with ESMTP id xf1si19765125icb.80.2011.03.22.05.00.17; Tue, 22 Mar 2011 05:00:18 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of thomas.ab@samsung.com designates 203.254.224.34 as permitted sender) client-ip=203.254.224.34; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of thomas.ab@samsung.com designates 203.254.224.34 as permitted sender) smtp.mail=thomas.ab@samsung.com Received: from epmmp2 (mailout4.samsung.com [203.254.224.34]) by mailout4.samsung.com (Oracle Communications Messaging Exchange Server 7u4-19.01 64bit (built Sep 7 2010)) with ESMTP id <0LIG00L03K05DS00@mailout4.samsung.com>; Tue, 22 Mar 2011 21:00:05 +0900 (KST) Received: from localhost.localdomain ([107.108.73.37]) by mmp2.samsung.com (iPlanet Messaging Server 5.2 Patch 2 (built Jul 14 2004)) with ESMTPA id <0LIG007IEK01JR@mmp2.samsung.com>; Tue, 22 Mar 2011 21:00:05 +0900 (KST) Date: Tue, 22 Mar 2011 17:29:29 +0530 From: Thomas Abraham Subject: [PATCH] ARM: EXYNOS4: Fix addruart macro To: nicolas.pitre@linaro.org Cc: linaro-dev@lists.linaro.org, kgene.kim@samsung.com, linux-samsung-soc@vger.kernel.org, patches@linaro.org Message-id: <1300795169-7312-1-git-send-email-thomas.ab@samsung.com> X-Mailer: git-send-email 1.6.6.rc2 Content-transfer-encoding: 7BIT Fix incorrect conditional execution of ldr instructions in addruart macro. Signed-off-by: Thomas Abraham Signed-off-by: Abhilash Kesavan --- arch/arm/mach-exynos4/include/mach/debug-macro.S | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-exynos4/include/mach/debug-macro.S b/arch/arm/mach-exynos4/include/mach/debug-macro.S index 58bbd04..a442ef8 100644 --- a/arch/arm/mach-exynos4/include/mach/debug-macro.S +++ b/arch/arm/mach-exynos4/include/mach/debug-macro.S @@ -21,8 +21,8 @@ */ .macro addruart, rp, rv - ldreq \rp, = S3C_PA_UART - ldrne \rv, = S3C_VA_UART + ldr \rp, = S3C_PA_UART + ldr \rv, = S3C_VA_UART #if CONFIG_DEBUG_S3C_UART != 0 add \rp, \rp, #(0x10000 * CONFIG_DEBUG_S3C_UART) add \rv, \rv, #(0x10000 * CONFIG_DEBUG_S3C_UART)