From: akpm@linux-foundation.org
To: akpm@linux-foundation.org, mm-commits@vger.kernel.org
Subject: [obsolete] linux-next-rejects.patch removed from -mm tree
Date: Sat, 04 Apr 2020 16:41:22 -0700 [thread overview]
Message-ID: <20200404234122.GNkDKF9zy%akpm@linux-foundation.org> (raw)
The patch titled
Subject: linux-next-rejects
has been removed from the -mm tree. Its filename was
linux-next-rejects.patch
This patch was dropped because it is obsolete
------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-rejects
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
include/linux/huge_mm.h | 41 ++++++++++++++++++++++++++++++++++++--
mm/memory.c | 11 ++++++----
2 files changed, 46 insertions(+), 6 deletions(-)
--- a/include/linux/huge_mm.h~linux-next-rejects
+++ a/include/linux/huge_mm.h
@@ -47,8 +47,45 @@ extern bool move_huge_pmd(struct vm_area
extern int change_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd,
unsigned long addr, pgprot_t newprot,
unsigned long cp_flags);
-vm_fault_t vmf_insert_pfn_pmd(struct vm_fault *vmf, pfn_t pfn, bool write);
-vm_fault_t vmf_insert_pfn_pud(struct vm_fault *vmf, pfn_t pfn, bool write);
+vm_fault_t vmf_insert_pfn_pmd_prot(struct vm_fault *vmf, pfn_t pfn,
+ pgprot_t pgprot, bool write);
+
+/**
+ * vmf_insert_pfn_pmd - insert a pmd size pfn
+ * @vmf: Structure describing the fault
+ * @pfn: pfn to insert
+ * @pgprot: page protection to use
+ * @write: whether it's a write fault
+ *
+ * Insert a pmd size pfn. See vmf_insert_pfn() for additional info.
+ *
+ * Return: vm_fault_t value.
+ */
+static inline vm_fault_t vmf_insert_pfn_pmd(struct vm_fault *vmf, pfn_t pfn,
+ bool write)
+{
+ return vmf_insert_pfn_pmd_prot(vmf, pfn, vmf->vma->vm_page_prot, write);
+}
+vm_fault_t vmf_insert_pfn_pud_prot(struct vm_fault *vmf, pfn_t pfn,
+ pgprot_t pgprot, bool write);
+
+/**
+ * vmf_insert_pfn_pud - insert a pud size pfn
+ * @vmf: Structure describing the fault
+ * @pfn: pfn to insert
+ * @pgprot: page protection to use
+ * @write: whether it's a write fault
+ *
+ * Insert a pud size pfn. See vmf_insert_pfn() for additional info.
+ *
+ * Return: vm_fault_t value.
+ */
+static inline vm_fault_t vmf_insert_pfn_pud(struct vm_fault *vmf, pfn_t pfn,
+ bool write)
+{
+ return vmf_insert_pfn_pud_prot(vmf, pfn, vmf->vma->vm_page_prot, write);
+}
+
enum transparent_hugepage_flag {
TRANSPARENT_HUGEPAGE_FLAG,
TRANSPARENT_HUGEPAGE_REQ_MADV_FLAG,
--- a/mm/memory.c~linux-next-rejects
+++ a/mm/memory.c
@@ -3974,11 +3974,14 @@ static inline vm_fault_t wp_huge_pmd(str
return handle_userfault(vmf, VM_UFFD_WP);
return do_huge_pmd_wp_page(vmf, orig_pmd);
}
- if (vmf->vma->vm_ops->huge_fault)
- return vmf->vma->vm_ops->huge_fault(vmf, PE_SIZE_PMD);
+ if (vmf->vma->vm_ops->huge_fault) {
+ vm_fault_t ret = vmf->vma->vm_ops->huge_fault(vmf, PE_SIZE_PMD);
- /* COW handled on pte level: split pmd */
- VM_BUG_ON_VMA(vmf->vma->vm_flags & VM_SHARED, vmf->vma);
+ if (!(ret & VM_FAULT_FALLBACK))
+ return ret;
+ }
+
+ /* COW or write-notify handled on pte level: split pmd. */
__split_huge_pmd(vmf->vma, vmf->pmd, vmf->address, false, NULL);
return VM_FAULT_FALLBACK;
_
Patches currently in -mm which might be from akpm@linux-foundation.org are
drivers-tty-serial-sh-scic-suppress-uninitialized-var-warning.patch
mm.patch
memcg-optimize-memorynuma_stat-like-memorystat-fix.patch
mm-clarify-__gfp_memalloc-usage-checkpatch-fixes.patch
mm-hugetlbc-fix-printk-format-warning-for-32-bit-phys_addr_t-fix.patch
mm-migratec-migrate-pg_readahead-flag-fix.patch
hv_balloon-dont-check-for-memhp_auto_online-manually-fix.patch
proc-faster-open-read-close-with-permanent-files-checkpatch-fixes.patch
linux-next-fix.patch
linux-next-git-rejects.patch
mm-add-vm_insert_pages-fix.patch
net-zerocopy-use-vm_insert_pages-for-tcp-rcv-zerocopy-fix.patch
seq_read-info-message-about-buggy-next-functions-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
next reply other threads:[~2020-04-04 23:41 UTC|newest]
Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-04 23:41 akpm [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-04-05 18:14 [obsolete] linux-next-rejects.patch removed from -mm tree Andrew Morton
2022-01-20 21:21 akpm
2021-11-04 1:47 akpm
2021-09-08 20:34 akpm
2021-07-06 19:07 akpm
2021-05-08 22:37 akpm
2021-03-20 3:07 akpm
2021-03-15 17:47 akpm
2021-03-09 4:05 akpm
2021-02-26 20:43 akpm
2020-12-23 18:26 akpm
2020-12-16 17:01 akpm
2020-10-16 20:45 akpm
2020-08-18 22:35 akpm
2020-08-06 23:18 akpm
2020-06-10 0:36 akpm
[not found] <20200607212615.b050e41fac139a1e16fe00bd@linux-foundation.org>
2020-06-08 6:09 ` Andrew Morton
2020-06-05 19:54 akpm
2020-04-21 1:13 incoming Andrew Morton
2020-04-24 3:49 ` [obsolete] linux-next-rejects.patch removed from -mm tree Andrew Morton
2020-02-19 19:13 akpm
2020-01-16 1:29 akpm
2018-02-07 19:53 akpm
2018-02-01 23:54 akpm
2017-09-07 18:35 akpm
2017-07-13 20:37 akpm
2017-06-16 19:27 akpm
2017-04-24 22:40 akpm
2016-12-14 19:22 akpm
2016-10-25 18:49 akpm
2016-08-03 18:22 akpm
2016-07-27 23:11 akpm
2016-05-23 20:03 akpm
2016-04-15 18:26 akpm
2016-03-22 17:46 akpm
2016-01-22 1:17 akpm
2015-11-06 20:15 akpm
2015-09-11 18:10 akpm
2015-06-25 19:02 akpm
2015-04-20 19:08 akpm
2015-03-02 19:09 akpm
2015-02-13 20:18 akpm
2015-02-11 20:20 akpm
2014-12-14 4:04 akpm
2014-10-14 18:17 akpm
2014-08-06 19:02 akpm
2014-06-16 19:07 akpm
2014-05-16 20:45 akpm
2014-04-14 20:07 akpm
2014-04-09 17:53 akpm
2014-04-04 19:28 akpm
2014-02-11 19:23 akpm
2013-11-22 21:13 akpm
2013-11-06 20:58 akpm
2013-10-29 19:44 akpm
2013-09-30 18:57 akpm
2013-05-07 17:43 akpm
2013-04-30 18:17 akpm
2013-03-14 18:50 akpm
2012-12-20 20:12 akpm
2012-12-14 21:35 akpm
2012-11-19 20:19 akpm
2012-05-31 19:12 akpm
2012-04-06 18:47 akpm
2011-07-26 7:47 akpm
2011-05-25 19:43 akpm
2011-03-23 20:29 akpm
2011-02-16 20:20 akpm
2011-01-21 20:30 akpm
2011-01-13 19:53 akpm
2009-03-30 18:40 akpm
2009-03-03 19:36 akpm
2009-02-17 19:44 akpm
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=20200404234122.GNkDKF9zy%akpm@linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mm-commits@vger.kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).