From patchwork Wed Jul 16 19:09:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Catalin Marinas X-Patchwork-Id: 33752 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f72.google.com (mail-qa0-f72.google.com [209.85.216.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C30F120CA0 for ; Wed, 16 Jul 2014 19:12:31 +0000 (UTC) Received: by mail-qa0-f72.google.com with SMTP id cm18sf3357763qab.3 for ; Wed, 16 Jul 2014 12:12:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id :in-reply-to:references:cc:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:content-type:content-transfer-encoding; bh=WstUCP1y5ebWUVbbx0EVZOhl3DHPG/bUf8yP4haY7yQ=; b=SHFWO9wCJqqn0kxxhhRAncvPMCaymoAHwPHnF1iF1gQ+QJYKy8VAv6yhenVe9Em27x zLthp1zRIJHXxIRu2kJ5SoeyC1DA1AqHrmfisHZ50PNECuMLbSGp9/zMXziMsyPKf4TN IGiBV5fEcWtUp5R52olvFklwrEeEgO2gf3b0WNeV0De8Ls3MOhX7kJMM6wNAQTUhrBmh X10nSj+sWjjOT8xgwuZbLpMU8DShpu2eqvwUhy4fg+R709foV1KTDK3Y2z/5NH23sMte 7LnMoHvhKlqc//W80J9/Y2z2eP5FrqY24voaQN3mmWOC+JPqPgQlw5Ir7jDfTjKOPKDX 2IrA== X-Gm-Message-State: ALoCoQmrHPcAcR5jiQV09ySnkBlAU1AdhMf+DYQWxLBu2i+8b7sOPrntmUUGBCu0zCMtv9qtbG5U X-Received: by 10.224.103.135 with SMTP id k7mr15459152qao.6.1405537951565; Wed, 16 Jul 2014 12:12:31 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.37.18 with SMTP id q18ls485020qgq.70.gmail; Wed, 16 Jul 2014 12:12:31 -0700 (PDT) X-Received: by 10.52.244.138 with SMTP id xg10mr9659391vdc.40.1405537951499; Wed, 16 Jul 2014 12:12:31 -0700 (PDT) Received: from mail-vc0-f182.google.com (mail-vc0-f182.google.com [209.85.220.182]) by mx.google.com with ESMTPS id bk6si408273vcb.55.2014.07.16.12.12.31 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 16 Jul 2014 12:12:31 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.182 as permitted sender) client-ip=209.85.220.182; Received: by mail-vc0-f182.google.com with SMTP id hy4so2543800vcb.41 for ; Wed, 16 Jul 2014 12:12:31 -0700 (PDT) X-Received: by 10.221.26.10 with SMTP id rk10mr32641191vcb.0.1405537951416; Wed, 16 Jul 2014 12:12:31 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp322879vcb; Wed, 16 Jul 2014 12:12:30 -0700 (PDT) X-Received: by 10.68.171.131 with SMTP id au3mr18202948pbc.125.1405537948580; Wed, 16 Jul 2014 12:12:28 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id sj7si181506pbc.44.2014.07.16.12.12.28 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Jul 2014 12:12:28 -0700 (PDT) Received-SPF: none (google.com: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org does not designate permitted sender hosts) client-ip=2001:1868:205::9; 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 1X7UbV-0002NN-PZ; Wed, 16 Jul 2014 19:11:01 +0000 Received: from fw-tnat.austin.arm.com ([217.140.110.23] helo=collaborate-mta1.arm.com) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1X7Ub8-00029C-28 for linux-arm-kernel@lists.infradead.org; Wed, 16 Jul 2014 19:10:38 +0000 Received: from e102109-lin.cambridge.arm.com (e102109-lin.cambridge.arm.com [10.1.203.182]) by collaborate-mta1.arm.com (Postfix) with ESMTP id 0A78913FAAD; Wed, 16 Jul 2014 14:10:06 -0500 (CDT) From: Catalin Marinas To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v7 02/11] arm64: Remove duplicate (SWAPPER|IDMAP)_DIR_SIZE definitions Date: Wed, 16 Jul 2014 20:09:43 +0100 Message-Id: <1405537792-23666-3-git-send-email-catalin.marinas@arm.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1405537792-23666-1-git-send-email-catalin.marinas@arm.com> References: <1405537792-23666-1-git-send-email-catalin.marinas@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140716_121038_175019_AB2BA14E X-CRM114-Status: UNSURE ( 6.94 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -0.0 SPF_PASS SPF: sender matches SPF record Cc: jays.lee@samsung.com X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: catalin.marinas@arm.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.182 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Just keep the asm/page.h definition as this is included in vmlinux.lds.S as well. Signed-off-by: Catalin Marinas Acked-by: Mark Rutland --- arch/arm64/include/asm/pgtable.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index e0ccceb317d9..d7455fa83bc7 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -383,9 +383,6 @@ static inline pmd_t pmd_modify(pmd_t pmd, pgprot_t newprot) extern pgd_t swapper_pg_dir[PTRS_PER_PGD]; extern pgd_t idmap_pg_dir[PTRS_PER_PGD]; -#define SWAPPER_DIR_SIZE (3 * PAGE_SIZE) -#define IDMAP_DIR_SIZE (2 * PAGE_SIZE) - /* * Encode and decode a swap entry: * bits 0-1: present (must be zero)