The patch titled Subject: lib/list_sort.c: rearrange includes has been removed from the -mm tree. Its filename was lib-list_sortc-rearrange-includes.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Rasmus Villemoes <linux@xxxxxxxxxxxxxxxxxx> Subject: lib/list_sort.c: rearrange includes Memory allocation only happens in the self test, just as random numbers are only used there. So move the inclusion of slab.h inside the CONFIG_TEST_LIST_SORT. We don't need module.h and all of the stuff it carries with it, so replace with export.h and compiler.h. Unfortunately, the ARRAY_SIZE macro from kernel.h requires the user to ensure bug.h is also included (for BUILD_BUG_ON_ZERO, used by __must_be_array). We used to get that through some maze of nested includes, but just include it explicitly. linux/string.h is then only included implicitly through kernel.h->printk.h->dynamic_debug.h, but only if !CONFIG_DYNAMIC_DEBUG, so just include it explicitly (for memset). objdump -d says the generated code is the same, and wc -l says that lib/.list_sort.o.cmd went from 579 to 165 lines. Signed-off-by: Rasmus Villemoes <linux@xxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- lib/list_sort.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff -puN lib/list_sort.c~lib-list_sortc-rearrange-includes lib/list_sort.c --- a/lib/list_sort.c~lib-list_sortc-rearrange-includes +++ a/lib/list_sort.c @@ -2,9 +2,11 @@ #define pr_fmt(fmt) "list_sort_test: " fmt #include <linux/kernel.h> -#include <linux/module.h> +#include <linux/bug.h> +#include <linux/compiler.h> +#include <linux/export.h> +#include <linux/string.h> #include <linux/list_sort.h> -#include <linux/slab.h> #include <linux/list.h> #define MAX_LIST_LENGTH_BITS 20 @@ -146,6 +148,7 @@ EXPORT_SYMBOL(list_sort); #ifdef CONFIG_TEST_LIST_SORT +#include <linux/slab.h> #include <linux/random.h> /* _ Patches currently in -mm which might be from linux@xxxxxxxxxxxxxxxxxx are origin.patch lib-bitmapc-change-prototype-of-bitmap_copy_le.patch lib-bitmapc-elide-bitmap_copy_le-on-little-endian.patch lib-bitmap-change-bitmap_shift_right-to-take-unsigned-parameters.patch lib-bitmap-eliminate-branch-in-__bitmap_shift_right.patch lib-bitmap-remove-redundant-code-from-__bitmap_shift_right.patch lib-bitmap-yet-another-simplification-in-__bitmap_shift_right.patch lib-bitmap-change-bitmap_shift_left-to-take-unsigned-parameters.patch lib-bitmap-eliminate-branch-in-__bitmap_shift_left.patch lib-bitmap-remove-redundant-code-from-__bitmap_shift_left.patch lib-stringc-improve-strrchr.patch checkpatch-emit-an-error-when-using-predefined-timestamp-macros.patch linux-next.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