[merged] kasan-module-move-module_align-macro-into-linux-moduleloaderh.patch removed from -mm tree

[merged] kasan-module-move-module_align-macro-into-linux-moduleloaderh.patch removed from -mm tree

[akpm]

The patch titled
     Subject: kasan, module: move MODULE_ALIGN macro into <linux/moduleloader.h>
has been removed from the -mm tree.  Its filename was
     kasan-module-move-module_align-macro-into-linux-moduleloaderh.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
From: Andrey Ryabinin <a.ryabinin@samsung.com>
Subject: kasan, module: move MODULE_ALIGN macro into <linux/moduleloader.h>

include/linux/moduleloader.h is more suitable place for this macro.
Also change alignment to PAGE_SIZE for CONFIG_KASAN=n as such
alignment already assumed in several places.

Signed-off-by: Andrey Ryabinin <a.ryabinin@samsung.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Acked-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 include/linux/kasan.h        |    4 ----
 include/linux/moduleloader.h |    8 ++++++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff -puN include/linux/kasan.h~kasan-module-move-module_align-macro-into-linux-moduleloaderh include/linux/kasan.h
--- a/include/linux/kasan.h~kasan-module-move-module_align-macro-into-linux-moduleloaderh
+++ a/include/linux/kasan.h
@@ -50,15 +50,11 @@ void kasan_krealloc(const void *object,
 void kasan_slab_alloc(struct kmem_cache *s, void *object);
 void kasan_slab_free(struct kmem_cache *s, void *object);
 
-#define MODULE_ALIGN (PAGE_SIZE << KASAN_SHADOW_SCALE_SHIFT)
-
 int kasan_module_alloc(void *addr, size_t size);
 void kasan_free_shadow(const struct vm_struct *vm);
 
 #else /* CONFIG_KASAN */
 
-#define MODULE_ALIGN 1
-
 static inline void kasan_unpoison_shadow(const void *address, size_t size) {}
 
 static inline void kasan_enable_current(void) {}
diff -puN include/linux/moduleloader.h~kasan-module-move-module_align-macro-into-linux-moduleloaderh include/linux/moduleloader.h
--- a/include/linux/moduleloader.h~kasan-module-move-module_align-macro-into-linux-moduleloaderh
+++ a/include/linux/moduleloader.h
@@ -84,4 +84,12 @@ void module_arch_cleanup(struct module *
 
 /* Any cleanup before freeing mod->module_init */
 void module_arch_freeing_init(struct module *mod);
+
+#ifdef CONFIG_KASAN
+#include <linux/kasan.h>
+#define MODULE_ALIGN (PAGE_SIZE << KASAN_SHADOW_SCALE_SHIFT)
+#else
+#define MODULE_ALIGN PAGE_SIZE
+#endif
+
 #endif
_

Patches currently in -mm which might be from a.ryabinin@samsung.com are

arm-factor-out-mmap-aslr-into-mmap_rnd.patch
mm-expose-arch_mmap_rnd-when-available.patch
mm-split-et_dyn-aslr-from-mmap-aslr.patch
mm-fold-arch_randomize_brk-into-arch_has_elf_randomize.patch
linux-next.patch