Message ID | 154275557997.76910.14689813630968180480.stgit@dwillia2-desk3.amr.corp.intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <owner-linux-mm@kvack.org> 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 E85E713AD for <patchwork-linux-mm@patchwork.kernel.org>; Tue, 20 Nov 2018 23:25:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D565E2AC4E for <patchwork-linux-mm@patchwork.kernel.org>; Tue, 20 Nov 2018 23:25:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C9C1E2AC59; Tue, 20 Nov 2018 23:25:30 +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 62ABA2AC4E for <patchwork-linux-mm@patchwork.kernel.org>; Tue, 20 Nov 2018 23:25:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7F1DE6B228A; Tue, 20 Nov 2018 18:25:29 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 7A1416B228C; Tue, 20 Nov 2018 18:25:29 -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 6B8606B228D; Tue, 20 Nov 2018 18:25:29 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) by kanga.kvack.org (Postfix) with ESMTP id 252C26B228A for <linux-mm@kvack.org>; Tue, 20 Nov 2018 18:25:29 -0500 (EST) Received: by mail-pl1-f198.google.com with SMTP id 89so4178574ple.19 for <linux-mm@kvack.org>; Tue, 20 Nov 2018 15:25:29 -0800 (PST) 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:subject:from :to:cc:date:message-id:in-reply-to:references:user-agent :mime-version:content-transfer-encoding; bh=aithbZX/wGkNS/bT9Ci8jPPiYgNzv1raTXrEw0rFYDo=; b=B060Xd+byzAxwY+9d3OjVLZSb7evfaQjl1MHeRXp39X6uWo3PLVHYy6oN74qes6MLE S+PP40qnwdsaKRyCtoQ+oz5INCSTrtfB8BLjNv39ChMiXxJo60DjsFq1WcqVV3XUThxD qs076YOi+SRc/vPrfgwn4uiHWuLpVktEm8Oud3JwLwtw8sNJvodd5W7XyZ3TJ9m0Urvj oNMY7qaZxbznElNmai7nPnjR0SUnYChPJ+SAamJepaxWE+ZUSYql/aHi6YMjE3nRPhZN 5MI8bEPpodDurZXu3XAOnO9LpH2FKHxC2zP2utjXOz34JMqj8qDu77UxBu2cYQDMW9Hv S47g== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of dan.j.williams@intel.com designates 134.134.136.65 as permitted sender) smtp.mailfrom=dan.j.williams@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Gm-Message-State: AA+aEWZ1CKMxiiEyu85QeMl7NXE9Y8Xi6Rizio7U7RKgS1V3ZzqJJZ0r JmnoJegsBLD1/YWoUsRNNttaOMsCJXII+hAy5SzGogsKmu09L4gwBt6xW73Oeb/365q2ZKuB6pV 0YfgkgTEENRXWax5wY0Vvu5g6f3dldPjRaP54h26aa4BDaiRr1BSBioI+SN+VWhIXMQ== X-Received: by 2002:a17:902:8c98:: with SMTP id t24mr4315292plo.130.1542756328791; Tue, 20 Nov 2018 15:25:28 -0800 (PST) X-Google-Smtp-Source: AFSGD/VHQGiIvbObGLKP5OTJBsvWAQ7lxo67s1Wi6bgncJWK6kvQdZrIPlHvc23R08ktDjjujAbw X-Received: by 2002:a17:902:8c98:: with SMTP id t24mr4315252plo.130.1542756328133; Tue, 20 Nov 2018 15:25:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542756328; cv=none; d=google.com; s=arc-20160816; b=koo4fZA+Yqu5X44491QJRduvag+mfXGIXafpXCCdBXkd0/F3h+S1miMuNQ/UkGQ9ol FfOsUjqn6fRi4omKiVicobuGJlBFtlYF2jGw8vJEVEAQ4oSZVSKNgd+zbOOmekJd6m5u H/uBQI1zozsC4UelBYo2WGmIn4infm9k4Kvlci/ihwIKgdpfbj8vGu2xbpEhOA7EPzIb fw8Pvbr6VCj0cjoz75ot+3sADn34L+ddz2HSUgDZPSm5kzjzTLGtdsxTIuxGztmiDtYf uj2zIXhH787kRppfBZqm6z43Gkxi3ggFoy8+RZKO09z6o/cPxr2TkSIQRP2y8aBsT7jN JGFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:user-agent:references :in-reply-to:message-id:date:cc:to:from:subject; bh=aithbZX/wGkNS/bT9Ci8jPPiYgNzv1raTXrEw0rFYDo=; b=ulIG13hHiNXqy0bvEPzJz7DOeN4+UZ4VjbI/HLXdD83zv9BWDgYJowMPBd6qr/YWwA ehFUz2ZJt6I8Lzuzha2aNswhv3J0Ah97XMxVEeP9Sxmt0ZMMTUtdQHevaQZ1jvpjx1Y0 MsrqPag2/9vhLOlfk7QeDaB5Klg72wMib0WO/kGXLKggopol068Opj6LA6XFcYdyYjvi Sd4vqpjo12Wr/8u2zB+34q1cj1MOKF3lNldSw27p05K6asCdwioXgfXtqOs29tYkHikw kxU9ievkv0D/xK8309Hb1SHtlJCc+flAnCks5Amc7TnPES7LyN0sdPtEWNCuKEYxngrB CM5A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of dan.j.williams@intel.com designates 134.134.136.65 as permitted sender) smtp.mailfrom=dan.j.williams@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga03.intel.com (mga03.intel.com. [134.134.136.65]) by mx.google.com with ESMTPS id z1si13048299plo.202.2018.11.20.15.25.27 for <linux-mm@kvack.org> (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Nov 2018 15:25:28 -0800 (PST) Received-SPF: pass (google.com: domain of dan.j.williams@intel.com designates 134.134.136.65 as permitted sender) client-ip=134.134.136.65; Authentication-Results: mx.google.com; spf=pass (google.com: domain of dan.j.williams@intel.com designates 134.134.136.65 as permitted sender) smtp.mailfrom=dan.j.williams@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 Nov 2018 15:25:27 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,258,1539673200"; d="scan'208";a="281654735" Received: from dwillia2-desk3.jf.intel.com (HELO dwillia2-desk3.amr.corp.intel.com) ([10.54.39.16]) by fmsmga005.fm.intel.com with ESMTP; 20 Nov 2018 15:25:27 -0800 Subject: [PATCH v8 2/7] mm, devm_memremap_pages: Kill mapping "System RAM" support From: Dan Williams <dan.j.williams@intel.com> To: akpm@linux-foundation.org Cc: =?utf-8?b?SsOpcsO0bWU=?= Glisse <jglisse@redhat.com>, Christoph Hellwig <hch@lst.de>, Logan Gunthorpe <logang@deltatee.com>, torvalds@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Date: Tue, 20 Nov 2018 15:13:00 -0800 Message-ID: <154275557997.76910.14689813630968180480.stgit@dwillia2-desk3.amr.corp.intel.com> In-Reply-To: <154275556908.76910.8966087090637564219.stgit@dwillia2-desk3.amr.corp.intel.com> References: <154275556908.76910.8966087090637564219.stgit@dwillia2-desk3.amr.corp.intel.com> User-Agent: StGit/0.18-2-gc94f MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit 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> X-Virus-Scanned: ClamAV using ClamSMTP |
Series |
mm: Merge hmm into devm_memremap_pages, mark GPL-only
|
expand
|
diff --git a/kernel/memremap.c b/kernel/memremap.c index 61dbcaa95530..99d14940acfa 100644 --- a/kernel/memremap.c +++ b/kernel/memremap.c @@ -167,15 +167,12 @@ void *devm_memremap_pages(struct device *dev, struct dev_pagemap *pgmap) is_ram = region_intersects(align_start, align_size, IORESOURCE_SYSTEM_RAM, IORES_DESC_NONE); - if (is_ram == REGION_MIXED) { - WARN_ONCE(1, "%s attempted on mixed region %pr\n", - __func__, res); + if (is_ram != REGION_DISJOINT) { + WARN_ONCE(1, "%s attempted on %s region %pr\n", __func__, + is_ram == REGION_MIXED ? "mixed" : "ram", res); return ERR_PTR(-ENXIO); } - if (is_ram == REGION_INTERSECTS) - return __va(res->start); - if (!pgmap->ref) return ERR_PTR(-EINVAL);