From: akpm@linux-foundation.org
To: avagin@openvz.org, mhocko@kernel.org, sfr@canb.auug.org.au,
mm-commits@vger.kernel.org
Subject: [folded-merged] fs-elf-drop-map_fixed-usage-from-elf_map-fix.patch removed from -mm tree
Date: Wed, 07 Feb 2018 14:48:35 -0800 [thread overview]
Message-ID: <5a7b8243.Arxrvo3sWQ9jtOYU%akpm@linux-foundation.org> (raw)
The patch titled
Subject: mm: don't use the same value for MAP_FIXED_NOREPLACE and MAP_SYNC
has been removed from the -mm tree. Its filename was
fs-elf-drop-map_fixed-usage-from-elf_map-fix.patch
This patch was dropped because it was folded into fs-elf-drop-map_fixed-usage-from-elf_map.patch
------------------------------------------------------
From: Andrei Vagin <avagin@openvz.org>
Subject: mm: don't use the same value for MAP_FIXED_NOREPLACE and MAP_SYNC
Link: http://lkml.kernel.org/r/20171218184916.24445-1-avagin@openvz.org
Fixes: ("fs, elf: drop MAP_FIXED usage from elf_map")
Signed-off-by: Andrei Vagin <avagin@openvz.org>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
include/uapi/asm-generic/mman-common.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff -puN include/uapi/asm-generic/mman-common.h~fs-elf-drop-map_fixed-usage-from-elf_map-fix include/uapi/asm-generic/mman-common.h
--- a/include/uapi/asm-generic/mman-common.h~fs-elf-drop-map_fixed-usage-from-elf_map-fix
+++ a/include/uapi/asm-generic/mman-common.h
@@ -26,7 +26,9 @@
#else
# define MAP_UNINITIALIZED 0x0 /* Don't support this flag */
#endif
-#define MAP_FIXED_NOREPLACE 0x80000 /* MAP_FIXED which doesn't unmap underlying mapping */
+
+/* 0x0100 - 0x80000 flags are defined in asm-generic/mman.h */
+#define MAP_FIXED_NOREPLACE 0x100000 /* MAP_FIXED which doesn't unmap underlying mapping */
/*
* Flags for mlock
_
Patches currently in -mm which might be from avagin@openvz.org are
fs-elf-drop-map_fixed-usage-from-elf_map.patch
procfs-add-seq_put_hex_ll-to-speed-up-proc-pid-maps.patch
procfs-add-seq_put_hex_ll-to-speed-up-proc-pid-maps-v2.patch
procfs-optimize-seq_pad-to-speed-up-proc-pid-maps.patch
next reply other threads:[~2018-02-07 22:48 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-07 22:48 akpm [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-02-07 22:45 [folded-merged] fs-elf-drop-map_fixed-usage-from-elf_map-fix.patch removed from -mm tree 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=5a7b8243.Arxrvo3sWQ9jtOYU%akpm@linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=avagin@openvz.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mhocko@kernel.org \
--cc=mm-commits@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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).