Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755330AbdLVAGJ (ORCPT ); Thu, 21 Dec 2017 19:06:09 -0500 Received: from ozlabs.org ([103.22.144.67]:53709 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752148AbdLVAGF (ORCPT ); Thu, 21 Dec 2017 19:06:05 -0500 From: Michael Ellerman To: Andrew Morton Cc: Kees Cook , "Michael Kerrisk \(man-pages\)" , Cyril Hrubis , Pavel Machek , Michal Hocko , Linux API , Khalid Aziz , "Russell King - ARM Linux" , Andrea Arcangeli , Linux-MM , LKML , linux-arch , Florian Weimer , John Hubbard , Matthew Wilcox , Jann Horn , "Mike Rapoport" Subject: Re: [PATCH 2/2] mmap.2: MAP_FIXED updated documentation In-Reply-To: <20171221142416.188c4d49cb225488781ef8b0@linux-foundation.org> References: <20171213092550.2774-1-mhocko@kernel.org> <20171213093110.3550-1-mhocko@kernel.org> <20171213093110.3550-2-mhocko@kernel.org> <20171213125540.GA18897@amd> <20171213130458.GI25185@dhcp22.suse.cz> <20171213130900.GA19932@amd> <20171213131640.GJ25185@dhcp22.suse.cz> <20171213132105.GA20517@amd> <20171213144050.GG11493@rei> <87po78fe7m.fsf@concordia.ellerman.id.au> <20171221142416.188c4d49cb225488781ef8b0@linux-foundation.org> Date: Fri, 22 Dec 2017 11:06:01 +1100 Message-ID: <87k1xfpqxi.fsf@concordia.ellerman.id.au> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2437 Lines: 67 Andrew Morton writes: > On Thu, 21 Dec 2017 23:38:37 +1100 Michael Ellerman wrote: > >> > Andrew, can you s/MAP_FIXED_SAFE/MAP_FIXED_NOREPLACE/g in the series? > > Done. Thanks. I sent an ack at some point, here's another if you like: Acked-by: Michael Ellerman There's also a couple of stray whitespace changes in the version in linux-next, and some inconsistent whitespace between the various mman.h changes. Patch below to fix them up if you haven't already. cheers diff --git a/arch/mips/include/uapi/asm/mman.h b/arch/mips/include/uapi/asm/mman.h index bb9ccb5ff3ed..5e362db59780 100644 --- a/arch/mips/include/uapi/asm/mman.h +++ b/arch/mips/include/uapi/asm/mman.h @@ -50,7 +50,6 @@ #define MAP_NONBLOCK 0x20000 /* do not block on IO */ #define MAP_STACK 0x40000 /* give out an address that is best suited for process/thread stacks */ #define MAP_HUGETLB 0x80000 /* create a huge page mapping */ - #define MAP_FIXED_SAFE 0x100000 /* MAP_FIXED which doesn't unmap underlying mapping */ /* diff --git a/arch/parisc/include/uapi/asm/mman.h b/arch/parisc/include/uapi/asm/mman.h index dedc09ead4cb..a0702506d7c6 100644 --- a/arch/parisc/include/uapi/asm/mman.h +++ b/arch/parisc/include/uapi/asm/mman.h @@ -26,7 +26,6 @@ #define MAP_NONBLOCK 0x20000 /* do not block on IO */ #define MAP_STACK 0x40000 /* give out an address that is best suited for process/thread stacks */ #define MAP_HUGETLB 0x80000 /* create a huge page mapping */ - #define MAP_FIXED_SAFE 0x100000 /* MAP_FIXED which doesn't unmap underlying mapping */ #define MS_SYNC 1 /* synchronous memory sync */ diff --git a/arch/sparc/include/uapi/asm/mman.h b/arch/sparc/include/uapi/asm/mman.h index d21bffd5d3dc..715a2c927e79 100644 --- a/arch/sparc/include/uapi/asm/mman.h +++ b/arch/sparc/include/uapi/asm/mman.h @@ -25,4 +25,5 @@ #define MAP_STACK 0x20000 /* give out an address that is best suited for process/thread stacks */ #define MAP_HUGETLB 0x40000 /* create a huge page mapping */ + #endif /* _UAPI__SPARC_MMAN_H__ */ diff --git a/arch/xtensa/include/uapi/asm/mman.h b/arch/xtensa/include/uapi/asm/mman.h index da73b6d5dbcd..52f4d21923b3 100644 --- a/arch/xtensa/include/uapi/asm/mman.h +++ b/arch/xtensa/include/uapi/asm/mman.h @@ -65,7 +65,6 @@ # define MAP_UNINITIALIZED 0x0 /* Don't support this flag */ #endif - /* * Flags for msync */