Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754964AbbB0PLE (ORCPT ); Fri, 27 Feb 2015 10:11:04 -0500 Received: from mailout4.w1.samsung.com ([210.118.77.14]:63562 "EHLO mailout4.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754780AbbB0PKb (ORCPT ); Fri, 27 Feb 2015 10:10:31 -0500 X-AuditID: cbfec7f5-b7fc86d0000066b7-5b-54f0884f6cc1 From: Andrey Ryabinin To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Ryabinin , Dmitry Vyukov , Rusty Russell Subject: [PATCH 2/2] kasan, module: move MODULE_ALIGN macro into Date: Fri, 27 Feb 2015 18:10:16 +0300 Message-id: <1425049816-11385-2-git-send-email-a.ryabinin@samsung.com> X-Mailer: git-send-email 2.3.0 In-reply-to: <1425049816-11385-1-git-send-email-a.ryabinin@samsung.com> References: <1425049816-11385-1-git-send-email-a.ryabinin@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrCJMWRmVeSWpSXmKPExsVy+t/xa7r+HR9CDD4sk7DY9usRm8Wc9WvY LCY8bGO3uLxrDpvFvTX/WS1uTrvA4sDmsWBTqcemT5PYPU7M+M3isWLDCWaPvi2rGD0+b5IL YIvisklJzcksSy3St0vgynj07C57wS7eit4jO5gaGHdydzFyckgImEj8nPuRHcIWk7hwbz1b FyMXh5DAUkaJ/deXskA4fUwS+2adZAGpYhPQk/g3azsbiC0ioCux6vkuZhCbWWAto8SMR+og trBApMTamfNZQWwWAVWJ1l0/wXp5BdwkJr5sY4TYJicx585FIJuDg1PAXWL5V2GQsBBQybkb x9gmMPIuYGRYxSiaWppcUJyUnmukV5yYW1yal66XnJ+7iRESUl93MC49ZnWIUYCDUYmH10Pi Q4gQa2JZcWXuIUYJDmYlEd7CKqAQb0piZVVqUX58UWlOavEhRiYOTqkGxtv7te5teBG2MT/h Q9ezulPsG1X/fjiQwiH+9XnDv0m7+pZ7fLp01OST/5p9adPzUps/du/TO3Pc4Y7Pd4821w21 oQGvK5a1G3RFX4qO+f73c5Ao07ULO3fVVqhfanh6zH3Lh8IL02TUqmbGyv1XdZe1tMrPYKpS ubF7n0TDhi+2KVu753w1SlZiKc5INNRiLipOBADTEVcDBwIAAA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1915 Lines: 57 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 Cc: Dmitry Vyukov Cc: Rusty Russell --- include/linux/kasan.h | 4 ---- include/linux/moduleloader.h | 8 ++++++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/include/linux/kasan.h b/include/linux/kasan.h index 5fa48a2..5bb0744 100644 --- a/include/linux/kasan.h +++ b/include/linux/kasan.h @@ -50,15 +50,11 @@ void kasan_krealloc(const void *object, size_t new_size); 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 --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h index f755626..4d0cb9b 100644 --- a/include/linux/moduleloader.h +++ b/include/linux/moduleloader.h @@ -84,4 +84,12 @@ void module_arch_cleanup(struct module *mod); /* Any cleanup before freeing mod->module_init */ void module_arch_freeing_init(struct module *mod); + +#ifdef CONFIG_KASAN +#include +#define MODULE_ALIGN (PAGE_SIZE << KASAN_SHADOW_SCALE_SHIFT) +#else +#define MODULE_ALIGN PAGE_SIZE +#endif + #endif -- 2.3.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/