From patchwork Sun Jul 15 06:00:45 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Shiyan X-Patchwork-Id: 1198461 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 572E7DF28B for ; Sun, 15 Jul 2012 06:09:32 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SqHtE-0007AI-T1; Sun, 15 Jul 2012 06:01:10 +0000 Received: from smtp22.mail.ru ([94.100.176.175]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1SqHsq-0007A4-Jf for linux-arm-kernel@lists.infradead.org; Sun, 15 Jul 2012 06:00:50 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mail.ru; s=mail; h=Message-Id:Date:Subject:Cc:To:From; bh=vNWYUGWoAk/KY/pu/I/sQT0ugKkyzm2T5TNVF5oc81o=; b=Ca61Ooj/WT06AWctwV+y8MXqChwSp3sBK5k+Wb1FsOWhHNIRnJcmg/S3GzKP0hQgdgeQSv8Sy/ZXfNtrOOaaK+zcHQg0phOe/pEEvSK2DvqruVxAj9ITLrvoptZQFKFy; Received: from [188.134.41.72] (port=54459 helo=localhost.localdomain) by smtp22.mail.ru with esmtpa (envelope-from ) id 1SqHsk-0000ne-Fe; Sun, 15 Jul 2012 10:00:38 +0400 From: Alexander Shiyan To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] ARM: Fix compile breakage when CONFIG_XIP_KERNEL is set Date: Sun, 15 Jul 2012 10:00:45 +0400 Message-Id: <1342332045-25632-1-git-send-email-shc_work@mail.ru> X-Mailer: git-send-email 1.7.3.4 X-Spam: Not detected X-Mras: Ok X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (shc_work[at]mail.ru) -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [94.100.176.175 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Russell King , Alexander Shiyan X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org arch/arm/kernel/head.o: In function `stext': (.head.text+0x34): undefined reference to `PHYS_OFFSET' This patch fix this problem by replacing PHYS_OFFSET to PLAT_PHYS_OFFSET. Signed-off-by: Alexander Shiyan --- arch/arm/kernel/head.S | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S index 835898e..8fb7502 100644 --- a/arch/arm/kernel/head.S +++ b/arch/arm/kernel/head.S @@ -113,7 +113,7 @@ ENTRY(stext) sub r4, r3, r4 @ (PHYS_OFFSET - PAGE_OFFSET) add r8, r8, r4 @ PHYS_OFFSET #else - ldr r8, =PHYS_OFFSET @ always constant in this case + ldr r8, =PLAT_PHYS_OFFSET @ always constant in this case #endif /*