From patchwork Wed Mar 30 12:25:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 8695861 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B92B79F39A for ; Wed, 30 Mar 2016 12:28:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CAEC42035E for ; Wed, 30 Mar 2016 12:28:46 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B7D822035B for ; Wed, 30 Mar 2016 12:28:45 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1alFDR-0006s5-Rh; Wed, 30 Mar 2016 12:27:17 +0000 Received: from mail-wm0-x22e.google.com ([2a00:1450:400c:c09::22e]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1alFCb-0006QN-RS for linux-arm-kernel@lists.infradead.org; Wed, 30 Mar 2016 12:26:27 +0000 Received: by mail-wm0-x22e.google.com with SMTP id 127so95371697wmu.1 for ; Wed, 30 Mar 2016 05:26:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=s4hziIBON0duByHyYhtd3/JMP6XgE/fyOS26LaD3tOc=; b=awPHstPk4wxa6vsWgl4ENINdGKKV+A6Bfs4o7KaMX7+1lKpbUjuw0rQQ6B8MOZmdS+ NlhjMixJZki43MyJirHKQX+VZYbxVQgzpoOV88YkeFMJjYTcZvsOWjtkaf7lIZ2ElyTd fgkM4OEsZXVEM/J2LsbO2/XPL8zOshVm6EKzY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=s4hziIBON0duByHyYhtd3/JMP6XgE/fyOS26LaD3tOc=; b=eo1B3AQi6EmKzJBAkPE27SEkpZrvOe3OkdzWPdEjA2qrFAuC7n4/bgO4Uhzg8GIPtj LuulaRcXO014wOVFlyCsXzUeb15oOfBqt5B03MVa1QzPSN2iUWkcKZ90Ba4CQ2e2jRNJ xNPoFhatXnYcQk//kjLyfveta74b5+8LSulMJhdpjsC4rjtB+cXY5N/OeI5kvsWQ9sfz hLux05Szs63ArM96V7UtByZvlGQ5Fk4uRCrJZ7cGYqxZNFEMYuBjL817zpju7eb1P77L XMcjJ1UmN0HGCoVwZMVvUlsr4bjbDPvI4ZsmwbvQ/isthtN5EgJaBuBybmpus37YlEWl QQkw== X-Gm-Message-State: AD7BkJK9Yz2gH33kGKAMerNsroX36wYU5uUmrVrGc8S5Ny7XhtbOrZGImuBkGheAbaam+6sc X-Received: by 10.195.13.16 with SMTP id eu16mr9937148wjd.140.1459340764342; Wed, 30 Mar 2016 05:26:04 -0700 (PDT) Received: from localhost.localdomain ([195.55.142.58]) by smtp.gmail.com with ESMTPSA id u14sm19502511wmu.8.2016.03.30.05.26.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 30 Mar 2016 05:26:03 -0700 (PDT) From: Ard Biesheuvel To: linux-arm-kernel@lists.infradead.org, catalin.marinas@arm.com Subject: [PATCH v2 3/3] Revert "arm64: account for sparsemem section alignment when choosing vmemmap offset" Date: Wed, 30 Mar 2016 14:25:48 +0200 Message-Id: <1459340748-14975-4-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1459340748-14975-1-git-send-email-ard.biesheuvel@linaro.org> References: <1459340748-14975-1-git-send-email-ard.biesheuvel@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160330_052626_183801_00E2A386 X-CRM114-Status: UNSURE ( 9.88 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.7 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, will.deacon@arm.com, Ard Biesheuvel MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This reverts commit 36e5cd6b897e17d03008f81e075625d8e43e52d0, since the section alignment is now guaranteed by construction when choosing the value of memstart_addr. Signed-off-by: Ard Biesheuvel --- arch/arm64/include/asm/pgtable.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index 989fef16d461..aa6106ac050c 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -32,14 +32,13 @@ * VMALLOC_END: extends to the available space below vmmemmap, PCI I/O space, * fixed mappings and modules */ -#define VMEMMAP_SIZE ALIGN((1UL << (VA_BITS - PAGE_SHIFT)) * sizeof(struct page), PUD_SIZE) +#define VMEMMAP_SIZE ALIGN((1UL << (VA_BITS - PAGE_SHIFT - 1)) * sizeof(struct page), PUD_SIZE) #define VMALLOC_START (MODULES_END) #define VMALLOC_END (PAGE_OFFSET - PUD_SIZE - VMEMMAP_SIZE - SZ_64K) #define VMEMMAP_START (VMALLOC_END + SZ_64K) -#define vmemmap ((struct page *)VMEMMAP_START - \ - SECTION_ALIGN_DOWN(memstart_addr >> PAGE_SHIFT)) +#define vmemmap ((struct page *)VMEMMAP_START - (memstart_addr >> PAGE_SHIFT)) #define FIRST_USER_ADDRESS 0UL