From patchwork Thu Jul 26 19:35:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Tatashin X-Patchwork-Id: 10546337 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C09A5112B for ; Thu, 26 Jul 2018 19:35:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AE1D22B685 for ; Thu, 26 Jul 2018 19:35:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A07D22BCDA; Thu, 26 Jul 2018 19:35:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 828142B685 for ; Thu, 26 Jul 2018 19:35:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 982216B000C; Thu, 26 Jul 2018 15:35:31 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 930146B000D; Thu, 26 Jul 2018 15:35:31 -0400 (EDT) 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 820A76B000E; Thu, 26 Jul 2018 15:35:31 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-qt0-f197.google.com (mail-qt0-f197.google.com [209.85.216.197]) by kanga.kvack.org (Postfix) with ESMTP id 568F56B000C for ; Thu, 26 Jul 2018 15:35:31 -0400 (EDT) Received: by mail-qt0-f197.google.com with SMTP id g7-v6so2121338qtp.19 for ; Thu, 26 Jul 2018 12:35:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:subject:date:message-id :in-reply-to:references; bh=4zEpFMlFhWgE0aXlCk/41YZX98c+jpFomxA+EUOlTjk=; b=T9c3ewhQjaGpjEVUED1AQUynluwg3bWFnJOY9TLpvkIRh4AMadcgGz8bbPSSqdP5z3 cKN2o/7BQ0L9DsWu36BpssQnO5gbydw2Xd8xtxUh2Cz5miEZp1XYw8mKU523yILh5Xrw okx94x+wJLRKEYR41zLXc7c80kN7Q/mCh5IzxuQBuUR/IbLX54ycmKlz74EUG2SIbwUu IodAf1m/S7A5je1kRgYvBVjMVZGlyYU2MW2mGSZyYrbdu1eTKoRST1HPxq5wVOV2lmvk D3iBPpMKa7ZEQFdB0VzzpQgkyTMzEpA8xZ4nRKoZ2YfOuKwjmYrqAlU6Swz3aIds89wD Jyfg== X-Gm-Message-State: AOUpUlHqs3mhogVKxD7nrejhdUAW8lINj/+8ObHKVPPhImHEBslqa489 kiTzq+F2V40fw+Bxb67jh+roZwb7xh7rHk/GK156FbXjtMEXQXrKDhntUPYpKxNSNKsV9gHDCNx usFpcHscwuOoJ7tr3/9BV7NFuGvvN26cyAyb0405XYx94uumEipWhon07o+t8sb5uxw== X-Received: by 2002:a37:aa86:: with SMTP id t128-v6mr3124939qke.135.1532633731076; Thu, 26 Jul 2018 12:35:31 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdKj7QHm5ZWGTcrs3lfys+VO9e+nYpsnNW/TspI2rH/ygn+cMqxSfZa894beB615qd8OFBg X-Received: by 2002:a37:aa86:: with SMTP id t128-v6mr3124893qke.135.1532633730397; Thu, 26 Jul 2018 12:35:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532633730; cv=none; d=google.com; s=arc-20160816; b=FkMyReaotZF7N6maSNwjZvzpAOlglw/INy2i/886tBosMHLMqcmoWYifFKyBvNAFuV NiZkVkLVpno2qKZEy+/5pxkf1CQwoMhcJJ1ShPJUV+sR/YqsvX0vg3eXqVWxOTCSYIRg LkprScXCHpZBfHHGqSzMidEzRdY0jygW2pAkShJ8QqgO/KVgq5hDtaRw4rvbMinur4ab bABlvYo3n+EGaX+0sWFqYez1BCm01GXUF+obyGM2Z1i8pnQS3G6EMwMy4Vq90IJpZrv6 0XMh9m2iYpGvJTU5jza0N5ZnXiJDcQMWHlS8NOMUrKv/CL4feIlRMBVoV/9JqqN4OeNm 29pQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:to:from :dkim-signature:arc-authentication-results; bh=4zEpFMlFhWgE0aXlCk/41YZX98c+jpFomxA+EUOlTjk=; b=qCAbm4WJOCJmVFDq5e3M7SkLy9Ofl4VBbYNWNZjZv9oOQ8VZ8P8zbc+1KUn//tKFJz YnXdOKj1cO2Fhv3LWV2xjCLl7+6YANwU4YYZAbmKeSEZthRNf2AQt0J332SyBF9CIrUo 0+R35FxE3T1zKxDiSmcTYxlhX6ThrwYmhNfdrsPN0DpTQjPSAnBVXYLXJ1j9ezRhH+JT rzMh0U7m66oHgbo8vj3w1U9FGZnmySxHkzdpaQgBGZR+Xc3LKSdKdusvqFbmk+nuN5Pu Km6QYzqTtpm0OhJDhtcWAfAoCtpgnV5hbekcocZ8IBCjUomFXDJWwz5HO2xbCs2X2w2W p8Tg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2018-07-02 header.b=cXN2QuUK; spf=pass (google.com: domain of pasha.tatashin@oracle.com designates 141.146.126.78 as permitted sender) smtp.mailfrom=pasha.tatashin@oracle.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: from aserp2120.oracle.com (aserp2120.oracle.com. [141.146.126.78]) by mx.google.com with ESMTPS id m54-v6si2148909qtk.122.2018.07.26.12.35.30 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Jul 2018 12:35:30 -0700 (PDT) Received-SPF: pass (google.com: domain of pasha.tatashin@oracle.com designates 141.146.126.78 as permitted sender) client-ip=141.146.126.78; Authentication-Results: mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2018-07-02 header.b=cXN2QuUK; spf=pass (google.com: domain of pasha.tatashin@oracle.com designates 141.146.126.78 as permitted sender) smtp.mailfrom=pasha.tatashin@oracle.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: from pps.filterd (aserp2120.oracle.com [127.0.0.1]) by aserp2120.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w6QJSRF9153802; Thu, 26 Jul 2018 19:35:21 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references; s=corp-2018-07-02; bh=4zEpFMlFhWgE0aXlCk/41YZX98c+jpFomxA+EUOlTjk=; b=cXN2QuUK5ZauhLNe8IWHTOXd8UAqgieEgcrnvX3AxCV/K/BstspmXbQ8CaHwUUxAuBQn f6llF1STawbFSDPnu0m1FudEQQLpWh4OmJLwyKgxlL8R15KcYY2dSqRtSy8ApsCOSu0V ygay7XUBu9uzRG2Zc4ZkYSMVZbSEViH6ahGluNBD3iAjrWIJ7lsiq8oFddabRo0C2Ekt mXu31ITcw7QB6p/PIMdjzzbcJ/8R+dCkh8U1uhCEXBZP41cf8n4DODYeYJOCel19o1cH mXTp+DiO+LuGvufMVobzoWDy2yul9MfFwWGW+W+MUSUCW9XoRLYzR0XVQXMNozga9KYP Zg== Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by aserp2120.oracle.com with ESMTP id 2kbvsp4hpe-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 26 Jul 2018 19:35:21 +0000 Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by aserv0021.oracle.com (8.14.4/8.14.4) with ESMTP id w6QJZKJ0021229 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 26 Jul 2018 19:35:20 GMT Received: from abhmp0012.oracle.com (abhmp0012.oracle.com [141.146.116.18]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id w6QJZIjM000784; Thu, 26 Jul 2018 19:35:18 GMT Received: from localhost.localdomain (/73.69.118.222) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 26 Jul 2018 12:35:18 -0700 From: Pavel Tatashin To: steven.sistare@oracle.com, daniel.m.jordan@oracle.com, linux-kernel@vger.kernel.org, akpm@linux-foundation.org, kirill.shutemov@linux.intel.com, mhocko@suse.com, linux-mm@kvack.org, dan.j.williams@intel.com, jack@suse.cz, jglisse@redhat.com, jrdr.linux@gmail.com, bhe@redhat.com, gregkh@linuxfoundation.org, vbabka@suse.cz, richard.weiyang@gmail.com, dave.hansen@intel.com, rientjes@google.com, mingo@kernel.org, osalvador@techadventures.net, pasha.tatashin@oracle.com, abdhalee@linux.vnet.ibm.com, mpe@ellerman.id.au Subject: [PATCH v2 1/3] mm: make memmap_init a proper function Date: Thu, 26 Jul 2018 15:35:07 -0400 Message-Id: <20180726193509.3326-2-pasha.tatashin@oracle.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180726193509.3326-1-pasha.tatashin@oracle.com> References: <20180726193509.3326-1-pasha.tatashin@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8966 signatures=668706 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=2 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=687 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1806210000 definitions=main-1807260200 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: X-Virus-Scanned: ClamAV using ClamSMTP memmap_init is sometimes a macro sometimes a function based on __HAVE_ARCH_MEMMAP_INIT. It is only a function on ia64. Make memmap_init a weak function instead, and let ia64 redefine it. Signed-off-by: Pavel Tatashin Reviewed-by: Andrew Morton Reviewed-by: Oscar Salvador --- arch/ia64/include/asm/pgtable.h | 1 - mm/page_alloc.c | 9 +++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/ia64/include/asm/pgtable.h b/arch/ia64/include/asm/pgtable.h index 165827774bea..b1e7468eb65a 100644 --- a/arch/ia64/include/asm/pgtable.h +++ b/arch/ia64/include/asm/pgtable.h @@ -544,7 +544,6 @@ extern struct page *zero_page_memmap_ptr; # ifdef CONFIG_VIRTUAL_MEM_MAP /* arch mem_map init routine is needed due to holes in a virtual mem_map */ -# define __HAVE_ARCH_MEMMAP_INIT extern void memmap_init (unsigned long size, int nid, unsigned long zone, unsigned long start_pfn); # endif /* CONFIG_VIRTUAL_MEM_MAP */ diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 2dec8056a091..6796dacd46ac 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -5554,10 +5554,11 @@ static void __meminit zone_init_free_lists(struct zone *zone) } } -#ifndef __HAVE_ARCH_MEMMAP_INIT -#define memmap_init(size, nid, zone, start_pfn) \ - memmap_init_zone((size), (nid), (zone), (start_pfn), MEMMAP_EARLY, NULL) -#endif +void __meminit __weak memmap_init(unsigned long size, int nid, + unsigned long zone, unsigned long start_pfn) +{ + memmap_init_zone(size, nid, zone, start_pfn, MEMMAP_EARLY, NULL); +} static int zone_batchsize(struct zone *zone) {