From patchwork Wed Oct 6 07:17:57 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 234901 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o967FP8s009164 for ; Wed, 6 Oct 2010 07:15:50 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932133Ab0JFHPu (ORCPT ); Wed, 6 Oct 2010 03:15:50 -0400 Received: from mail-pz0-f46.google.com ([209.85.210.46]:47407 "EHLO mail-pz0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932110Ab0JFHPu (ORCPT ); Wed, 6 Oct 2010 03:15:50 -0400 Received: by pzk34 with SMTP id 34so1840541pzk.19 for ; Wed, 06 Oct 2010 00:15:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:date:message-id :in-reply-to:references:subject; bh=vGabJ/82PdGJ6cx/9lP+GOwnjgdPJR67NELxVFf8dLo=; b=Nu68utyfQwf/wgktt1E5B6FFuhbPH6itNRnZkeE+21ofh6DuRhP7S3vu0h0BrNXfCs zZCFieSclHMzTrNDLt8XaHC4K2SSzbDbZFkvMfaOSlKrs1pAHbJt0DBiKe43K+ipLsuR K6pZmZu14flurUloJBVCi+dAALsKDHmsVSlrE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:date:message-id:in-reply-to:references:subject; b=Y2JqaFSVYhoUxDEEsmM9bX7TZpnsqCwz1yu1+sdULeiBBorbnDzGK2rJqPUzj89qpU eL1ZEiCuPprrdZi74f31e9GU7eDcJtE4tADVUOlh4smmmmfbOBojoVDSuD+/m13hrid3 mGBC4qSV8rQ8z7hrPnC4QofQjJzt5CuSCuIyY= Received: by 10.115.106.13 with SMTP id i13mr15118464wam.24.1286349349516; Wed, 06 Oct 2010 00:15:49 -0700 (PDT) Received: from [127.0.0.1] (49.14.32.202.bf.2iij.net [202.32.14.49]) by mx.google.com with ESMTPS id c24sm840290wam.7.2010.10.06.00.15.47 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 06 Oct 2010 00:15:48 -0700 (PDT) From: Magnus Damm To: linux@arm.linux.org.uk Cc: grant.likely@secretlab.ca, Magnus Damm , lethal@linux-sh.org, linux-arm-kernel@lists.infradead.org, linux-sh@vger.kernel.org Date: Wed, 06 Oct 2010 16:17:57 +0900 Message-Id: <20101006071757.28048.71028.sendpatchset@t400s> In-Reply-To: <20101006071731.28048.89938.sendpatchset@t400s> References: <20101006071731.28048.89938.sendpatchset@t400s> Subject: [PATCH 03/08] ARM: Make alignment_trap macro self-contained Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Wed, 06 Oct 2010 07:15:50 +0000 (UTC) --- 0003/arch/arm/include/asm/entry-header.S +++ work/arch/arm/include/asm/entry-header.S 2010-10-06 15:06:16.000000000 +0900 @@ -38,9 +38,13 @@ .macro alignment_trap, rtemp #ifdef CONFIG_ALIGNMENT_TRAP - ldr \rtemp, .LCcralign + ldr \rtemp, 1f ldr \rtemp, [\rtemp] mcr p15, 0, \rtemp, c1, c0 + b 2f +1: + .word cr_alignment +2: #endif .endm --- 0003/arch/arm/kernel/entry-armv.S +++ work/arch/arm/kernel/entry-armv.S 2010-10-06 14:28:47.000000000 +0900 @@ -255,8 +255,6 @@ __pabt_svc: ENDPROC(__pabt_svc) .align 5 -.LCcralign: - .word cr_alignment #ifdef MULTI_DABORT .LCprocfns: .word processor