Message ID | 20200204013406.JTuy_3j_s%akpm@linux-foundation.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <SRS0=xrrM=3Y=kvack.org=owner-linux-mm@kernel.org> Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0094313A4 for <patchwork-linux-mm@patchwork.kernel.org>; Tue, 4 Feb 2020 01:34:10 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id C17E72086A for <patchwork-linux-mm@patchwork.kernel.org>; Tue, 4 Feb 2020 01:34:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="heAcR1Vo" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C17E72086A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linux-foundation.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id B7E126B0266; Mon, 3 Feb 2020 20:34:08 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id B0A826B0269; Mon, 3 Feb 2020 20:34:08 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9D0036B026A; Mon, 3 Feb 2020 20:34:08 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0182.hostedemail.com [216.40.44.182]) by kanga.kvack.org (Postfix) with ESMTP id 838F46B0266 for <linux-mm@kvack.org>; Mon, 3 Feb 2020 20:34:08 -0500 (EST) Received: from smtpin09.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 3AE632DFA for <linux-mm@kvack.org>; Tue, 4 Feb 2020 01:34:08 +0000 (UTC) X-FDA: 76450723776.09.basin59_6f7db8bed107 X-Spam-Summary: 2,0,0,545b9fbc7f8ae225,d41d8cd98f00b204,akpm@linux-foundation.org,:akpm@linux-foundation.org:aneesh.kumar@linux.ibm.com:dan.j.williams@intel.com:david@redhat.com:gregkh@linuxfoundation.org::logang@deltatee.com:mhocko@suse.com:mm-commits@vger.kernel.org:osalvador@suse.de:pagupta@redhat.com:pasha.tatashin@soleen.com:torvalds@linux-foundation.org:willy@infradead.org,RULES_HIT:41:69:355:379:800:960:967:973:988:989:1260:1263:1345:1359:1381:1431:1437:1535:1544:1711:1730:1747:1777:1792:2194:2199:2393:2525:2559:2563:2682:2685:2741:2859:2895:2898:2901:2902:2924:2926:2933:2937:2939:2942:2945:2947:2951:2954:3022:3138:3139:3140:3141:3142:3355:3369:3865:3866:3867:3868:3870:3871:3872:3874:3934:3936:3938:3941:3944:3947:3950:3953:3956:3959:4250:4321:4605:5007:6119:6261:6653:6737:7264:7576:7875:7903:8599:8603:9025:9121:9545:10004:10913:11026:11473:11657:11658:11914:12043:12048:12294:12296:12297:12438:12517:12519:12555:12679:12683:12783:12986:13161:13229:13846:13869:14181:14721 :14849:2 X-HE-Tag: basin59_6f7db8bed107 X-Filterd-Recvd-Size: 5730 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf39.hostedemail.com (Postfix) with ESMTP for <linux-mm@kvack.org>; Tue, 4 Feb 2020 01:34:07 +0000 (UTC) Received: from localhost.localdomain (c-73-231-172-41.hsd1.ca.comcast.net [73.231.172.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B74F62084E; Tue, 4 Feb 2020 01:34:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580780047; bh=CTTCvjdYhblKbhs329wOmplyKIBIYBgwzvKL+sCP/58=; h=Date:From:To:Subject:In-Reply-To:From; b=heAcR1VoGPb8c+Blu/pmIysav8RwORPfudw96JoUpejBqyDl4ekk6mQTSpTQqV+1h CBWyhlTtgu3pDhzKs9SC0AUnbcPgCoQjiqQ+9Hv/HOLyI3l+2Xp82ayMdKa/0rtkAX YxZgTpvGqZB+XutnmEBWc7UtOoVM4deRvyTjN8wE= Date: Mon, 03 Feb 2020 17:34:06 -0800 From: Andrew Morton <akpm@linux-foundation.org> To: akpm@linux-foundation.org, aneesh.kumar@linux.ibm.com, dan.j.williams@intel.com, david@redhat.com, gregkh@linuxfoundation.org, linux-mm@kvack.org, logang@deltatee.com, mhocko@suse.com, mm-commits@vger.kernel.org, osalvador@suse.de, pagupta@redhat.com, pasha.tatashin@soleen.com, torvalds@linux-foundation.org, willy@infradead.org Subject: [patch 07/67] mm/memmap_init: update variable name in memmap_init_zone Message-ID: <20200204013406.JTuy_3j_s%akpm@linux-foundation.org> In-Reply-To: <20200203173311.6269a8be06a05e5a4aa08a93@linux-foundation.org> User-Agent: s-nail v14.8.16 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: <linux-mm.kvack.org> |
Series |
[01/67] ocfs2: fix oops when writing cloned file
|
expand
|
--- a/mm/page_alloc.c~mm-memmap_init-update-variable-name-in-memmap_init_zone +++ a/mm/page_alloc.c @@ -5946,10 +5946,10 @@ void __meminit memmap_init_zone(unsigned #ifdef CONFIG_ZONE_DEVICE void __ref memmap_init_zone_device(struct zone *zone, unsigned long start_pfn, - unsigned long size, + unsigned long nr_pages, struct dev_pagemap *pgmap) { - unsigned long pfn, end_pfn = start_pfn + size; + unsigned long pfn, end_pfn = start_pfn + nr_pages; struct pglist_data *pgdat = zone->zone_pgdat; struct vmem_altmap *altmap = pgmap_altmap(pgmap); unsigned long zone_idx = zone_idx(zone); @@ -5966,7 +5966,7 @@ void __ref memmap_init_zone_device(struc */ if (altmap) { start_pfn = altmap->base_pfn + vmem_altmap_offset(altmap); - size = end_pfn - start_pfn; + nr_pages = end_pfn - start_pfn; } for (pfn = start_pfn; pfn < end_pfn; pfn++) { @@ -6013,7 +6013,7 @@ void __ref memmap_init_zone_device(struc } pr_info("%s initialised %lu pages in %ums\n", __func__, - size, jiffies_to_msecs(jiffies - start)); + nr_pages, jiffies_to_msecs(jiffies - start)); } #endif