The patch titled
Subject: mips: rename brk_rnd() to mmap_rnd()
has been added to the -mm tree. Its filename is
mips-rename-brk_rnd-to-mmap_rnd.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/mips-rename-brk_rnd-to-mmap_rnd.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/mips-rename-brk_rnd-to-mmap_rnd.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: mips: rename brk_rnd() to mmap_rnd()
To match the other architectures.
Cc: Hector Marco-Gisbert <hecmargi@xxxxxx>
Cc: Ismael Ripoll <iripoll@xxxxxx>
Cc: Kees Cook <keescook@xxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxxxxx>
Cc: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/mips/mm/mmap.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff -puN arch/mips/mm/mmap.c~mips-rename-brk_rnd-to-mmap_rnd arch/mips/mm/mmap.c
--- a/arch/mips/mm/mmap.c~mips-rename-brk_rnd-to-mmap_rnd
+++ a/arch/mips/mm/mmap.c
@@ -164,7 +164,7 @@ void arch_pick_mmap_layout(struct mm_str
}
}
-static inline unsigned long brk_rnd(void)
+static inline unsigned long mmap_rnd(void)
{
unsigned long rnd = get_random_int();
@@ -183,7 +183,7 @@ unsigned long arch_randomize_brk(struct
unsigned long base = mm->brk;
unsigned long ret;
- ret = PAGE_ALIGN(base + brk_rnd());
+ ret = PAGE_ALIGN(base + mmap_rnd());
if (ret < mm->brk)
return mm->brk;
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
arch-alpha-kernel-systblss-remove-debug-check.patch
i-need-old-gcc.patch
kernel-sysc-fix-uname26-for-40-fix.patch
mm.patch
mm-cma-release-trigger-checkpatch-fixes.patch
mm-cma-allocation-trigger-fix.patch
mm-compaction-enhance-compaction-finish-condition-fix.patch
page_writeback-cleanup-mess-around-cancel_dirty_page-checkpatch-fixes.patch
mm-hide-per-cpu-lists-in-output-of-show_mem-fix.patch
mm-vmscan-fix-the-page-state-calculation-in-too_many_isolated.patch
x86-add-pmd_-for-thp-fix.patch
sparc-add-pmd_-for-thp-fix.patch
mips-rename-brk_rnd-to-mmap_rnd.patch
fix-offset2lib-issue-for-x86-arm-powerpc-and-mips-fix.patch
kernel-conditionally-support-non-root-users-groups-and-capabilities-checkpatch-fixes.patch
lib-find__bit-reimplementation-fix.patch
fs-fat-remove-unnecessary-includes-fix.patch
kconfig-use-macros-which-are-already-defined-fix.patch
linux-next.patch
linux-next-rejects.patch
lib-kconfig-fix-up-have_arch_bitreverse-help-text.patch
do_shared_fault-check-that-mmap_sem-is-held.patch
journal_add_journal_head-debug.patch
journal_add_journal_head-debug-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
mutex-subsystem-synchro-test-module.patch
slab-leaks3-default-y.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
