Received: by 2002:a5d:9c59:0:0:0:0:0 with SMTP id 25csp56630iof; Sun, 5 Jun 2022 21:00:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzuRTDv739AMp+qH4E3661nt2b3XP6pCvLUuJmcKFqgpWzQjT3+asU8F29ClN6yCW+mZx3+ X-Received: by 2002:a17:90a:e58a:b0:1e2:fe75:dd5f with SMTP id g10-20020a17090ae58a00b001e2fe75dd5fmr40983275pjz.138.1654488005720; Sun, 05 Jun 2022 21:00:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654488005; cv=none; d=google.com; s=arc-20160816; b=TFw8YwJ5d64AbXfnyiC/7LW4o+uvoBKEO70PrXtqvOnSYe+YEzcuyUtZsz4IwOJflj 2UJx7w7zyXmc5YdIxLub6+7QXKrzDUqXYALGRy/9OFpOdIb2EgplOVGicuRBsEj4dtJq h3CadK5Qt08spXKfljnYKzc89XFNda8wojcQBW5NGNwPR+IDTBwKFA6ogfiH0963V6CB emJBf6wI5oZo3QEtDReMMscuNJB9oDP6giBKd7pHMYkUimI4kIBZ80TlQCTDolLZXAQ/ QXVee3/S7U9wDroJoPneoQxbvSgv6xPcKk7FOFJsVsju4R9bvr5C2bBjMhc20xXicEL6 H/Kw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:date:mime-version:content-transfer-encoding :message-id:references:subject:cc:to:dkim-signature:dkim-signature :from; bh=dFpRWKPODUhp2CdDTQOhreDjP/1BEPmurYOKch6Cf/0=; b=JQEuQx+iNAYPVnyHhVzMMFSJBILxcl+EI7PDCnEnfIfi79FBEe8YpskfrqeyaLq5Ro TCLPO+1BHTKZMqcEbDx5n7aPyTuFleLhAkbf0l5wj9x9p6/h6aqGZRwBEgIwMzEgGuZd b+i7CH9OcxVcQmniU8Ftk9mOuT1AzGIC/6+5jy4IQtfyk2wn+aIm6281umy/KiVibai1 r+UFWkMvSfFFaAv8rxO/gL6ZBls2zVt7sTl6mNQKkhplAp7KdTcbJJpFM1ldyB4GEByJ k9XtBqiggsvuQd5/fz2Y/MLPYFh+r2PYmMuIwBh2jeF5KG12i7PW7iYCu/ER2qb5rXJh 3VSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b="rK//GCYF"; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id q3-20020a655243000000b003c2828476a9si16847811pgp.641.2022.06.05.21.00.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Jun 2022 21:00:05 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b="rK//GCYF"; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id ADB2C67D3C; Sun, 5 Jun 2022 20:46:09 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351084AbiFEJb0 (ORCPT + 99 others); Sun, 5 Jun 2022 05:31:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39286 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350947AbiFEJbK (ORCPT ); Sun, 5 Jun 2022 05:31:10 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1E3172E6A4 for ; Sun, 5 Jun 2022 02:31:05 -0700 (PDT) From: Thomas Gleixner DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1654421463; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: references:references; bh=dFpRWKPODUhp2CdDTQOhreDjP/1BEPmurYOKch6Cf/0=; b=rK//GCYFhNw/Wm+M6C9AzQJbwH++tzdK+7EAdJgh9t5shC8jmTCv34C3yJoMJM2U4F/9aW GcSlHHMygsJMXIeBPdmZ8dIneiNSSg7s+YEfdfKaf8J6nuTSoCTYkfARBPQAS1b/wUsHOf 2wwmuckHvhSUBhUlqtyVTUojSi0aWxTbSlxzoBKATed2+wmwQaX3+OJHpufvQbVCnnx/Ud fetrpnCO1WqVfyVkJGnPP75t4OsxudwrPC9hVdGQ3dc7hZJiUT1tOawxpjApDTXzji2WTD AjhDcChX2edlGNWMPBEmF+x7Ws7Ew74vUJ77x9RT7lf8m259U1uFfWrXKugnXg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1654421463; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: references:references; bh=dFpRWKPODUhp2CdDTQOhreDjP/1BEPmurYOKch6Cf/0=; b=anNanoQHwjVcuLzh9AbJmXEB0Eu1250enwKgk8u6Tq8buyK7Ouv5BMj3tnGbSEas9rRex0 htGMBZqPYHFg27Dg== To: Linus Torvalds Cc: linux-kernel@vger.kernel.org, x86@kernel.org Subject: [GIT pull] x86/mm for v5.19-rc1 References: <165442136963.152751.14259048792272164569.tglx@xen13> Message-ID: <165442138128.152751.14866011543351593668.tglx@xen13> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Date: Sun, 5 Jun 2022 11:31:03 +0200 (CEST) X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Linus, please pull the latest x86/mm branch from: git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-mm-2022-06-05 up to: e19d11267f0e: x86/mm: Use PAGE_ALIGNED(x) instead of IS_ALIGNED(x, PA= GE_SIZE) Use PAGE_ALIGNED() instead of open coding it in the x86/mm code. Thanks, tglx ------------------> Fanjun Kong (1): x86/mm: Use PAGE_ALIGNED(x) instead of IS_ALIGNED(x, PAGE_SIZE) arch/x86/mm/init_64.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index 61d0ab154f96..8779d6be6a49 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c @@ -1240,8 +1240,8 @@ remove_pagetable(unsigned long start, unsigned long end= , bool direct, void __ref vmemmap_free(unsigned long start, unsigned long end, struct vmem_altmap *altmap) { - VM_BUG_ON(!IS_ALIGNED(start, PAGE_SIZE)); - VM_BUG_ON(!IS_ALIGNED(end, PAGE_SIZE)); + VM_BUG_ON(!PAGE_ALIGNED(start)); + VM_BUG_ON(!PAGE_ALIGNED(end)); =20 remove_pagetable(start, end, false, altmap); } @@ -1605,8 +1605,8 @@ int __meminit vmemmap_populate(unsigned long start, uns= igned long end, int node, { int err; =20 - VM_BUG_ON(!IS_ALIGNED(start, PAGE_SIZE)); - VM_BUG_ON(!IS_ALIGNED(end, PAGE_SIZE)); + VM_BUG_ON(!PAGE_ALIGNED(start)); + VM_BUG_ON(!PAGE_ALIGNED(end)); =20 if (end - start < PAGES_PER_SECTION * sizeof(struct page)) err =3D vmemmap_populate_basepages(start, end, node, NULL);