From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from wolverine02.qualcomm.com ([199.106.114.251]:47685 "EHLO wolverine02.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751031Ab0J0W0l (ORCPT ); Wed, 27 Oct 2010 18:26:41 -0400 From: Daniel Walker Subject: [PATCH -v2] msm: fix debug-macro.S build failure Date: Wed, 27 Oct 2010 15:25:59 -0700 Message-Id: <1288218359-1179-1-git-send-email-dwalker@codeaurora.org> In-Reply-To: <20101027221428.GB28391@n2100.arm.linux.org.uk> References: <20101027221428.GB28391@n2100.arm.linux.org.uk> Sender: linux-arm-msm-owner@vger.kernel.org List-ID: To: linux-arm-msm@vger.kernel.org Cc: linux-arm-kernel , Daniel Walker , Jeremy Kerr , Lorenzo Pieralisi , Jason Wang , Tony Lindgren , Nicolas Pitre , Russell King - ARM Linux Originally there was an ifdef case to handle when no debug uart was selected. In commit 0ea1293009826da45e1019f45dfde1e557bb30df that case was removed which causes the following build failure, /local/mnt/workspace/c_dwalke/git-trees/linux-2.6/arch/arm/kernel/debug.S: Assembler messages: /local/mnt/workspace/c_dwalke/git-trees/linux-2.6/arch/arm/kernel/debug.S:174: Error: bad instruction `addruart r1,r2' /local/mnt/workspace/c_dwalke/git-trees/linux-2.6/arch/arm/kernel/debug.S:176: Error: bad instruction `waituart r2,r3' /local/mnt/workspace/c_dwalke/git-trees/linux-2.6/arch/arm/kernel/debug.S:177: Error: bad instruction `senduart r1,r3' /local/mnt/workspace/c_dwalke/git-trees/linux-2.6/arch/arm/kernel/debug.S:178: Error: bad instruction `busyuart r2,r3' /local/mnt/workspace/c_dwalke/git-trees/linux-2.6/arch/arm/kernel/debug.S:190: Error: bad instruction `addruart r1,r2' This is a partial revert to add back the case which was removed, with one minor API change in addruart name the return values "rp, rv". Cc: Jeremy Kerr Cc: Lorenzo Pieralisi Cc: Jason Wang Cc: Tony Lindgren Cc: Nicolas Pitre Cc: Russell King - ARM Linux Signed-off-by: Daniel Walker --- arch/arm/mach-msm/include/mach/debug-macro.S | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-msm/include/mach/debug-macro.S b/arch/arm/mach-msm/include/mach/debug-macro.S index fbd5d90..d726eda 100644 --- a/arch/arm/mach-msm/include/mach/debug-macro.S +++ b/arch/arm/mach-msm/include/mach/debug-macro.S @@ -36,7 +36,16 @@ tst \rd, #0x04 beq 1001b .endm +#else + .macro addruart, rp, rv + .endm - .macro busyuart,rd,rx + .macro senduart,rd,rx + .endm + + .macro waituart,rd,rx .endm #endif + + .macro busyuart,rd,rx + .endm -- 1.7.0.4