diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-23 14:11:39 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-23 14:11:39 -0400 |
| commit | f131727e421c3f2cfbf5d1843512d5e270b1ad04 (patch) | |
| tree | 4dbb7aed49d345c4b2f0e769b7930460a4085b3b | |
| parent | d91e5d0f55cf70cdf8684a01f5df5fc6702afc3f (diff) | |
| download | longterm-queue-4.12-f131727e421c3f2cfbf5d1843512d5e270b1ad04.tar.gz | |
mm: drop already applied patch
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/mm-Handle-0-flags-in-_calc_vm_trans-macro.patch | 34 | ||||
| -rw-r--r-- | queue/series | 1 |
2 files changed, 0 insertions, 35 deletions
diff --git a/queue/mm-Handle-0-flags-in-_calc_vm_trans-macro.patch b/queue/mm-Handle-0-flags-in-_calc_vm_trans-macro.patch deleted file mode 100644 index 3d0a9e3..0000000 --- a/queue/mm-Handle-0-flags-in-_calc_vm_trans-macro.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 592e254502041f953e84d091eae2c68cba04c10b Mon Sep 17 00:00:00 2001 -From: Jan Kara <jack@suse.cz> -Date: Fri, 3 Nov 2017 12:21:21 +0100 -Subject: [PATCH] mm: Handle 0 flags in _calc_vm_trans() macro - -commit 592e254502041f953e84d091eae2c68cba04c10b upstream. - -_calc_vm_trans() does not handle the situation when some of the passed -flags are 0 (which can happen if these VM flags do not make sense for -the architecture). Improve the _calc_vm_trans() macro to return 0 in -such situation. Since all passed flags are constant, this does not add -any runtime overhead. - -Signed-off-by: Jan Kara <jack@suse.cz> -Signed-off-by: Dan Williams <dan.j.williams@intel.com> - -diff --git a/include/linux/mman.h b/include/linux/mman.h -index c8367041fafd..edb6cf6a81ed 100644 ---- a/include/linux/mman.h -+++ b/include/linux/mman.h -@@ -63,8 +63,9 @@ static inline bool arch_validate_prot(unsigned long prot) - * ("bit1" and "bit2" must be single bits) - */ - #define _calc_vm_trans(x, bit1, bit2) \ -+ ((!(bit1) || !(bit2)) ? 0 : \ - ((bit1) <= (bit2) ? ((x) & (bit1)) * ((bit2) / (bit1)) \ -- : ((x) & (bit1)) / ((bit1) / (bit2))) -+ : ((x) & (bit1)) / ((bit1) / (bit2)))) - - /* - * Combine the mmap "prot" argument into "vm_flags" used internally. --- -2.15.0 - diff --git a/queue/series b/queue/series index b821e15..aea64cd 100644 --- a/queue/series +++ b/queue/series @@ -49,7 +49,6 @@ badblocks-fix-wrong-return-value-in-badblocks_set-if.patch iommu-amd-Limit-the-IOVA-page-range-to-the-specified.patch xfs-truncate-pagecache-before-writeback-in-xfs_setat.patch crypto-tcrypt-fix-buffer-lengths-in-test_aead_speed.patch -mm-Handle-0-flags-in-_calc_vm_trans-macro.patch net-hns3-Fix-a-misuse-to-devm_free_irq.patch clk-mediatek-add-the-option-for-determining-PLL-sour.patch clk-imx-imx7d-Fix-parent-clock-for-OCRAM_CLK.patch |