From patchwork Fri Jun 15 23:32:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Luck X-Patchwork-Id: 10467811 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 84B9560348 for ; Fri, 15 Jun 2018 23:32:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6274D28EB3 for ; Fri, 15 Jun 2018 23:32:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 534D728EB6; Fri, 15 Jun 2018 23:32:45 +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=-2.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE 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 D35C928EB3 for ; Fri, 15 Jun 2018 23:32:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 95B516B0269; Fri, 15 Jun 2018 19:32:43 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 8E2376B026A; Fri, 15 Jun 2018 19:32:43 -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 7839D6B026B; Fri, 15 Jun 2018 19:32:43 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl0-f72.google.com (mail-pl0-f72.google.com [209.85.160.72]) by kanga.kvack.org (Postfix) with ESMTP id 2FD5C6B0269 for ; Fri, 15 Jun 2018 19:32:43 -0400 (EDT) Received: by mail-pl0-f72.google.com with SMTP id w1-v6so2859037plq.8 for ; Fri, 15 Jun 2018 16:32:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:date:from:to :cc:subject:message-id:references:mime-version:content-disposition :in-reply-to:user-agent; bh=VAiARrl+oqSn2z+8IEcf9NQ1aMqdnL/b6txQI4cyEaM=; b=JgQO9ESFLZtPrOlQJSdE0cUY6JPjQ4IPuG6bSqcDtzSmKWISOLKS/sxhRK/0Z7b3ky T4Vw4WVeKeCpk89MVfZr8UX1zxNgF4fKmdPOMyVJclRfNJRfQDkKZgHLKRxAXS+Vd0Qx C4q9Ah7osw/PyztB/qSz4X9iOTRT71p8mzfZnAthKmDzbgh+eyAnB8W7G9IVOt9pqnI0 QMIwKUfJYUMuN28giPRgw94+Laob9SdmOaY6V0RK/PEVKk/bPBD5cW7wG0eJ+Y8Le1TC 72QHRCZ0n0/RiQWPFLVVL1ufhLBcjAfbWJq2+Kh2Lkg+PeVfWVZoHM17s61kuqo5fuyg Gk0w== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of tony.luck@intel.com designates 192.55.52.120 as permitted sender) smtp.mailfrom=tony.luck@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Gm-Message-State: APt69E0wmYsR/2mNW2ko/dMGalBSTBiBGrxeCt2Eb4XGsMXACRKSY6um PNNSyg0P5xB2teVNjaNzuxaiYjNI+AGbkKG7CqPP5qDiT4hQvsD7blF/HnW2zD95HW+pfMoaA7W lqxbLHkOKDB1787Wn2aXY1RV/5iQm+NclwplpE/USdV2jJ7+wxdv2wH4rzia5JOYrTQ== X-Received: by 2002:a17:902:1007:: with SMTP id b7-v6mr4225262pla.88.1529105562878; Fri, 15 Jun 2018 16:32:42 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKnQdl8FckNezFcu12t2i/QW/ZQJBwfKqKMeE2k3t91G8lvydHt0+8am5yTLU87jHyFp1o/ X-Received: by 2002:a17:902:1007:: with SMTP id b7-v6mr4225183pla.88.1529105561121; Fri, 15 Jun 2018 16:32:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529105561; cv=none; d=google.com; s=arc-20160816; b=BKY5yxO8d0Dz6ViJdR8Cp08Ykmgz5FY/rTcXGrde92XU0uZk88+mbGRu0jT+VFHmC2 ZtH2FYSHunRmDQbWqSNqEvnh0b2HM7pEJFaupYrUUNFBSaSk2zO8/u1kl1nL7mK9srmb GfBppnysyzQO0FrfcjHN1KSxjkrRS5+apmUGMk2UM03sLkdrMox5XTQeRPMJ43Vfy/Ml FTlwwcXBiwqs+33rbYTQZUiV560Rg/cpoGpYUg91k+6olFvBbceKIcaO7WINlso2m4aG 0cXgX2cxzpQC8V8s7a7xoUUT/BznnzF0vYrneb7fZJJF0bbmrazdpZEiceJZSfQHh+jw MlxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=user-agent:in-reply-to:content-disposition:mime-version:references :message-id:subject:cc:to:from:date:arc-authentication-results; bh=VAiARrl+oqSn2z+8IEcf9NQ1aMqdnL/b6txQI4cyEaM=; b=AX2thrrI5OrjuORuySi2PMxqB0EGjNFpXNfBbkCwJvNVcIZylzJMeHKXvVHHEPBMM4 AZ/N9L4ccvTFa3yZktJN80EEo3+0gUOcnNvhOflybF2LM6gv3cosGlYN4jlxGLyFciub 49E2WMUZff4miIz4nhXku4+1kZtT+SYfD3Tw4jB0uNuaHdBg9M8GidO2HqZy795N7d/0 EPzg1IyAOjD5fciDMOOrhgIAKaBjI36Mllf6bXFYjUH7Y9lXgprS+/rSGmgmVe5a/GmM qpCGZX9uWrqVzNlos0a1OjdYX56nNxJ4kjDHNxQSBOzPQbnGODB/0pFibHm/MrpqCgO0 vQ1w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of tony.luck@intel.com designates 192.55.52.120 as permitted sender) smtp.mailfrom=tony.luck@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga04.intel.com (mga04.intel.com. [192.55.52.120]) by mx.google.com with ESMTPS id k23-v6si8258366pfi.177.2018.06.15.16.32.40 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Jun 2018 16:32:41 -0700 (PDT) Received-SPF: pass (google.com: domain of tony.luck@intel.com designates 192.55.52.120 as permitted sender) client-ip=192.55.52.120; Authentication-Results: mx.google.com; spf=pass (google.com: domain of tony.luck@intel.com designates 192.55.52.120 as permitted sender) smtp.mailfrom=tony.luck@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 15 Jun 2018 16:32:40 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,228,1526367600"; d="scan'208";a="237595201" Received: from agluck-desk.sc.intel.com (HELO agluck-desk) ([10.3.52.160]) by fmsmga005.fm.intel.com with ESMTP; 15 Jun 2018 16:32:40 -0700 Date: Fri, 15 Jun 2018 16:32:40 -0700 From: "Luck, Tony" To: Andrew Morton Cc: Mathieu Malaterre , linux-mm@kvack.org, Linux Kernel Mailing List Subject: Re: [PATCH] mm/memblock: add missing include Message-ID: <20180615233236.GA17678@agluck-desk> References: <20180606194144.16990-1-malat@debian.org> <20180615121716.37fb93385825b0b2f59240cc@linux-foundation.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.9.4 (2018-02-28) 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 This both compiles and boots on ia64. Builds OK on x86_64 with an Enterprise OS .config that includes: CONFIG_HAVE_MEMBLOCK=y CONFIG_NO_BOOTMEM=y -Tony ---- diff --git a/mm/memblock.c b/mm/memblock.c index cc16d70b8333..0a54d488f767 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -1225,6 +1225,7 @@ phys_addr_t __init memblock_alloc_try_nid(phys_addr_t size, phys_addr_t align, i return memblock_alloc_base(size, align, MEMBLOCK_ALLOC_ACCESSIBLE); } +#if defined(CONFIG_HAVE_MEMBLOCK) && defined(CONFIG_NO_BOOTMEM) /** * memblock_virt_alloc_internal - allocate boot memory block * @size: size of memory block to be allocated in bytes @@ -1432,6 +1433,7 @@ void * __init memblock_virt_alloc_try_nid( (u64)max_addr); return NULL; } +#endif /** * __memblock_free_early - free boot memory block