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: 64700 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp2565338lbc; Wed, 30 Mar 2016 05:28:16 -0700 (PDT) X-Received: by 10.66.102.8 with SMTP id fk8mr12763591pab.12.1459340895888; Wed, 30 Mar 2016 05:28:15 -0700 (PDT) Return-Path: Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id ff7si6212615pab.184.2016.03.30.05.28.15 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Mar 2016 05:28:15 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) client-ip=2001:1868:205::9; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) smtp.mailfrom=linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org 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-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [2a00:1450:400c:c09:0:0:0:22e 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_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 -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 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+patch=linaro.org@lists.infradead.org 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(-) -- 2.5.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel 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