From: akpm@linux-foundation.org
To: mm-commits@vger.kernel.org, vgoyal@redhat.com,
roger.pau@citrix.com, sfr@canb.auug.org.au
Subject: [obsolete] mm-memremap_pages-convert-to-struct-range-fix.patch removed from -mm tree
Date: Fri, 25 Sep 2020 19:41:27 -0700 [thread overview]
Message-ID: <20200926024127.0JWrU%akpm@linux-foundation.org> (raw)
The patch titled
Subject: merge fix up for "mm/memremap_pages: convert to 'struct range'"
has been removed from the -mm tree. Its filename was
mm-memremap_pages-convert-to-struct-range-fix.patch
This patch was dropped because it is obsolete
------------------------------------------------------
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: merge fix up for "mm/memremap_pages: convert to 'struct range'"
Link: https://lkml.kernel.org/r/20200908200950.1368e71b@canb.auug.org.au
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Vivek Goyal <vgoyal@redhat.com>
Cc: Roger Pau Monn <roger.pau@citrix.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
drivers/xen/unpopulated-alloc.c | 15 +++++++++------
fs/fuse/virtio_fs.c | 3 +--
2 files changed, 10 insertions(+), 8 deletions(-)
--- a/drivers/xen/unpopulated-alloc.c~mm-memremap_pages-convert-to-struct-range-fix
+++ a/drivers/xen/unpopulated-alloc.c
@@ -18,6 +18,7 @@ static unsigned int list_count;
static int fill_list(unsigned int nr_pages)
{
struct dev_pagemap *pgmap;
+ struct resource res;
void *vaddr;
unsigned int i, alloc_pages = round_up(nr_pages, PAGES_PER_SECTION);
int ret;
@@ -27,10 +28,10 @@ static int fill_list(unsigned int nr_pag
return -ENOMEM;
pgmap->type = MEMORY_DEVICE_GENERIC;
- pgmap->res.name = "Xen scratch";
- pgmap->res.flags = IORESOURCE_MEM | IORESOURCE_BUSY;
+ res.name = "Xen scratch";
+ res.flags = IORESOURCE_MEM | IORESOURCE_BUSY;
- ret = allocate_resource(&iomem_resource, &pgmap->res,
+ ret = allocate_resource(&iomem_resource, &res,
alloc_pages * PAGE_SIZE, 0, -1,
PAGES_PER_SECTION * PAGE_SIZE, NULL, NULL);
if (ret < 0) {
@@ -38,6 +39,8 @@ static int fill_list(unsigned int nr_pag
kfree(pgmap);
return ret;
}
+ pgmap->range.start = res.start;
+ pgmap->range.end = res.end;
#ifdef CONFIG_XEN_HAVE_PVMMU
/*
@@ -50,12 +53,12 @@ static int fill_list(unsigned int nr_pag
* conflict with any devices.
*/
if (!xen_feature(XENFEAT_auto_translated_physmap)) {
- xen_pfn_t pfn = PFN_DOWN(pgmap->res.start);
+ xen_pfn_t pfn = PFN_DOWN(res.start);
for (i = 0; i < alloc_pages; i++) {
if (!set_phys_to_machine(pfn + i, INVALID_P2M_ENTRY)) {
pr_warn("set_phys_to_machine() failed, no memory added\n");
- release_resource(&pgmap->res);
+ release_resource(&res);
kfree(pgmap);
return -ENOMEM;
}
@@ -66,7 +69,7 @@ static int fill_list(unsigned int nr_pag
vaddr = memremap_pages(pgmap, NUMA_NO_NODE);
if (IS_ERR(vaddr)) {
pr_err("Cannot remap memory range\n");
- release_resource(&pgmap->res);
+ release_resource(&res);
kfree(pgmap);
return PTR_ERR(vaddr);
}
--- a/fs/fuse/virtio_fs.c~mm-memremap_pages-convert-to-struct-range-fix
+++ a/fs/fuse/virtio_fs.c
@@ -835,8 +835,7 @@ static int virtio_fs_setup_dax(struct vi
* initialize a struct resource from scratch (only the start
* and end fields will be used).
*/
- pgmap->res = (struct resource){
- .name = "virtio-fs dax window",
+ pgmap->range = (struct range){
.start = (phys_addr_t) cache_reg.addr,
.end = (phys_addr_t) cache_reg.addr + cache_reg.len - 1,
};
_
Patches currently in -mm which might be from sfr@canb.auug.org.au are
mm-madvise-introduce-process_madvise-syscall-an-external-memory-hinting-api-fix-fix-fix.patch
mm-madvise-introduce-process_madvise-syscall-an-external-memory-hinting-api-fix-fix-fix-fix.patch
reply other threads:[~2020-09-26 2:41 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200926024127.0JWrU%akpm@linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mm-commits@vger.kernel.org \
--cc=roger.pau@citrix.com \
--cc=sfr@canb.auug.org.au \
--cc=vgoyal@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.