From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752165AbdF0A6O (ORCPT ); Mon, 26 Jun 2017 20:58:14 -0400 Received: from mail-qk0-f195.google.com ([209.85.220.195]:34604 "EHLO mail-qk0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751473AbdF0A6D (ORCPT ); Mon, 26 Jun 2017 20:58:03 -0400 From: Doug Berger To: Russell King Cc: Doug Berger , Laura Abbott , Ard Biesheuvel , Nicolas Pitre , Jon Medhurst , Florian Fainelli , Kees Cook , Marc Zyngier , linux-arm-kernel@lists.infradead.org (moderated list:ARM PORT), linux-kernel@vger.kernel.org (open list) Subject: [PATCH] ARM: small correction to early_ioremap support Date: Mon, 26 Jun 2017 17:57:29 -0700 Message-Id: <20170627005731.7869-1-opendmb@gmail.com> X-Mailer: git-send-email 2.13.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The fixmap pages need to be on the same pmd page for the current implementation of arm early_fixmap. A build time bug check is used to ensure that. However, the worst case fixmap range is better represented by __end_of_fixed_addresses than by the value __end_of_early_ioremap_region. Fixes: 2937367b8a4b ("ARM: add support for generic early_ioremap/early_memremap") Signed-off-by: Doug Berger --- arch/arm/mm/mmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index 31af3cb59a60..74c0ed5c3b08 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c @@ -392,7 +392,7 @@ void __init early_fixmap_init(void) * The early fixmap range spans multiple pmds, for which * we are not prepared: */ - BUILD_BUG_ON((__fix_to_virt(__end_of_early_ioremap_region) >> PMD_SHIFT) + BUILD_BUG_ON((__fix_to_virt(__end_of_fixed_addresses) >> PMD_SHIFT) != FIXADDR_TOP >> PMD_SHIFT); pmd = fixmap_pmd(FIXADDR_TOP); -- 2.13.0