The patch titled Subject: powerpc-standardize-mmap_rnd-usage-v4 has been removed from the -mm tree. Its filename was powerpc-standardize-mmap_rnd-usage-v4.patch This patch was dropped because it was folded into powerpc-standardize-mmap_rnd-usage.patch ------------------------------------------------------ From: Kees Cook <keescook@xxxxxxxxxxxx> Subject: powerpc-standardize-mmap_rnd-usage-v4 fixed mmap_base argument convention to be the same on all archs Signed-off-by: Kees Cook <keescook@xxxxxxxxxxxx> Cc: Michael Ellerman <mpe@xxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/powerpc/mm/mmap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN arch/powerpc/mm/mmap.c~powerpc-standardize-mmap_rnd-usage-v4 arch/powerpc/mm/mmap.c --- a/arch/powerpc/mm/mmap.c~powerpc-standardize-mmap_rnd-usage-v4 +++ a/arch/powerpc/mm/mmap.c @@ -66,7 +66,7 @@ static unsigned long mmap_rnd(void) return rnd << PAGE_SHIFT; } -static inline unsigned long mmap_base(unsigned long base) +static inline unsigned long mmap_base(unsigned long rnd) { unsigned long gap = rlimit(RLIMIT_STACK); @@ -75,7 +75,7 @@ static inline unsigned long mmap_base(un else if (gap > MAX_GAP) gap = MAX_GAP; - return PAGE_ALIGN(TASK_SIZE - gap - base); + return PAGE_ALIGN(TASK_SIZE - gap - rnd); } /* _ Patches currently in -mm which might be from keescook@xxxxxxxxxxxx are origin.patch binfmt_elf-fix-bug-in-loading-of-pie-binaries.patch arm-factor-out-mmap-aslr-into-mmap_rnd.patch x86-standardize-mmap_rnd-usage.patch arm64-standardize-mmap_rnd-usage.patch mips-extract-logic-for-mmap_rnd.patch powerpc-standardize-mmap_rnd-usage.patch s390-standardize-mmap_rnd-usage.patch mm-expose-arch_mmap_rnd-when-available.patch s390-redefine-randomize_et_dyn-for-elf_et_dyn_base.patch mm-split-et_dyn-aslr-from-mmap-aslr.patch mm-fold-arch_randomize_brk-into-arch_has_elf_randomize.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html