From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753048Ab3LaLU7 (ORCPT ); Tue, 31 Dec 2013 06:20:59 -0500 Received: from ni.piap.pl ([195.187.100.4]:45055 "EHLO ni.piap.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752763Ab3LaLU6 (ORCPT ); Tue, 31 Dec 2013 06:20:58 -0500 From: khalasa@piap.pl (Krzysztof =?utf-8?Q?Ha=C5=82asa?=) To: lkml , linux-arm-kernel@lists.infradead.org Cc: Santosh Shilimkar , Russell King Date: Tue, 31 Dec 2013 12:20:56 +0100 MIME-Version: 1.0 Message-ID: Content-Type: text/plain Subject: Regression (ARM) arch/arm/mm/init.c doesn't build without CONFIG_ARM_PATCH_PHYS_VIRT. X-Anti-Virus: Kaspersky Anti-Virus for Linux Mail Server 5.6.44/RELEASE, bases: 20131231 #7206063, check: 20131231 clean Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org arch/arm/mm/init.c: In function 'setup_dma_zone': arch/arm/mm/init.c:232:19: error: '__pv_phys_offset' undeclared (first use in this function) Reverting the following commit fixes it: commit 787b0d5c1ca7ff24feb6f92e4c7f4410ee7d81a8 Author: Santosh Shilimkar Date: Mon Dec 2 20:29:12 2013 +0100 ARM: 7908/1: mm: Fix the arm_dma_limit calculation Current code is using PHYS_OFFSET to calculate the arm_dma_limit which will lead to wrong calculations in cases where PHYS_OFFSET is updated runtime. So fix the code by using __pv_phys_offset instead of PHYS_OFFSET. It seems PHYS_OFFSET is equal to __pv_phys_offset if the latter is available: arch/arm/include/asm/memory.h:#define PHYS_OFFSET __pv_phys_offset Otherwise (without CONFIG_ARM_PATCH_PHYS_VIRT) PHYS_OFFSET is a hard-coded CONFIG value, or whatever the platform/CPU code needs: arch/arm/include/asm/memory.h:#define PHYS_OFFSET PLAT_PHYS_OFFSET Perhaps the patch in question was needed at some point but I think the situation had changed before it was commited. -- Krzysztof Halasa Research Institute for Automation and Measurements PIAP Al. Jerozolimskie 202, 02-486 Warsaw, Poland