Received: by 10.192.165.148 with SMTP id m20csp729219imm; Fri, 4 May 2018 05:37:08 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpgrZ56atUgaVUsyKb493ees9hTzx5EzWZGXTJnmvhZZYdvcWjefNEDxSyBBqdcHQoA5ZoK X-Received: by 2002:a17:902:2468:: with SMTP id m37-v6mr28260768plg.388.1525437428665; Fri, 04 May 2018 05:37:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525437428; cv=none; d=google.com; s=arc-20160816; b=g1Xv4YOhm1uE4O5ml9PXiI0mpKiJoAxgKlYsKn43oKJIS5DMJBv71mg1npIo+9p0wo lCZa246fUB3XkoAqBfkP16mqrKp4Xkvpyx1vkGwgWK5TkkWToyyO034xbMcxp9saEdfP pVRDjnOVNsWIPppf626DmJ07bGDtqi9g4cmSpbSwSk4PcMqXc/+njkPETa04nvpts8DS gk0JNpjG/DB9lOdH+YR5Di96xbkwa/NT7GvKaqTgNZe6BmBn/laVRo+1EFUAgjwVNLRl OwmtiA4FUq7HXh0pZ2aGVNdSNjktNS6Hgh5KortFpXVTVatZLY2vBUzBnEn2PaLBEdmk PofA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:date:cc:to:subject:from:references :in-reply-to:message-id:arc-authentication-results; bh=WTh0K7jZfTiqy1dx70pn8y9ctx1VCe0R0kPBO4zDt3Q=; b=Rzs9urZGaDCBUj3cpyTeequP4xDEcHIinJ513JMzcZ/0PUav5mUZR8uxx9fN2Bjuv0 hHnZWU4j1e2ytuHww8bWZuZmjuoimoaaDmbSDF+Tue1YDMKV1fWSraXrLI1ByJe/npm2 voInXqiBpMRgw13kXflzG3u2/ziApwkiPbADyt13qQDbF5uPJezp6fev4v1zdR98clMZ oHfY+k+KxyuXAZUtiLSNv7YP7Z4vCZlBh7nN+CxDYEe82J8kL5VoUAiXm8yIq8dMGwDb dp+IDgMl7K4BcrxuLHGRXRjbJiOz3rN+zXXzohQ+akoAQnMgKiEJOJKfPSDj+/mnn5dH P4+w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e6-v6si12605783pgr.374.2018.05.04.05.36.44; Fri, 04 May 2018 05:37:08 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751655AbeEDMeQ (ORCPT + 99 others); Fri, 4 May 2018 08:34:16 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:23270 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751612AbeEDMeN (ORCPT ); Fri, 4 May 2018 08:34:13 -0400 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 40crzg466yz9twmv; Fri, 4 May 2018 14:34:07 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [192.168.12.234]) (amavisd-new, port 10024) with ESMTP id vrLUHvCm2MzU; Fri, 4 May 2018 14:34:07 +0200 (CEST) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 40crzg2Xdcz9ttC1; Fri, 4 May 2018 14:34:07 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 17A2D8B975; Fri, 4 May 2018 14:34:11 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id E0I20xT3nKFG; Fri, 4 May 2018 14:34:11 +0200 (CEST) Received: from po14934vm.idsi0.si.c-s.fr (po15451.idsi0.si.c-s.fr [172.25.231.2]) by messagerie.si.c-s.fr (Postfix) with ESMTP id ECFE48B972; Fri, 4 May 2018 14:34:10 +0200 (CEST) Received: by po14934vm.idsi0.si.c-s.fr (Postfix, from userid 0) id C8C1F6CF2D; Fri, 4 May 2018 14:34:10 +0200 (CEST) Message-Id: <4fd69cf9e9a7ce45e7bf1c64de4272d519944a80.1525435203.git.christophe.leroy@c-s.fr> In-Reply-To: References: From: Christophe Leroy Subject: [PATCH 10/17] powerpc: use _ALIGN macro To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , aneesh.kumar@linux.vnet.ibm.com Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Fri, 4 May 2018 14:34:10 +0200 (CEST) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Christophe Leroy --- arch/powerpc/include/asm/nohash/32/pgtable.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/include/asm/nohash/32/pgtable.h b/arch/powerpc/include/asm/nohash/32/pgtable.h index b413abcd5a09..93dc22dbe964 100644 --- a/arch/powerpc/include/asm/nohash/32/pgtable.h +++ b/arch/powerpc/include/asm/nohash/32/pgtable.h @@ -99,9 +99,9 @@ extern int icache_44x_need_flush; */ #define VMALLOC_OFFSET (0x1000000) /* 16M */ #ifdef PPC_PIN_SIZE -#define VMALLOC_BASE (((_ALIGN((long)high_memory, PPC_PIN_SIZE) + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1))) +#define VMALLOC_BASE _ALIGN_DOWN(_ALIGN((long)high_memory, PPC_PIN_SIZE) + VMALLOC_OFFSET, VMALLOC_OFFSET) #else -#define VMALLOC_BASE ((((long)high_memory + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1))) +#define VMALLOC_BASE _ALIGN_DOWN((long)high_memory + VMALLOC_OFFSET, VMALLOC_OFFSET) #endif #define VMALLOC_START ioremap_bot #define VMALLOC_END IOREMAP_END -- 2.13.3