The patch titled lists: remove a redundant conditional definition of list_add() has been added to the -mm tree. Its filename is lists-remove-a-redundant-conditional-definition-of-list_add.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 *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: lists: remove a redundant conditional definition of list_add() From: "Robert P. J. Day" <rpjday@xxxxxxxxxxxxxx> Remove the conditional surrounding the definition of list_add() from list.h since, if you define CONFIG_DEBUG_LIST, the definition you will subsequently pick up from lib/list_debug.c will be absolutely identical, at which point you can remove that redundant definition from list_debug.c as well. Signed-off-by: Robert P. J. Day <rpjday@xxxxxxxxxxxxxx> Cc: Dave Jones <davej@xxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/list.h | 4 ---- lib/list_debug.c | 14 -------------- 2 files changed, 18 deletions(-) diff -puN include/linux/list.h~lists-remove-a-redundant-conditional-definition-of-list_add include/linux/list.h --- a/include/linux/list.h~lists-remove-a-redundant-conditional-definition-of-list_add +++ a/include/linux/list.h @@ -61,14 +61,10 @@ extern void __list_add(struct list_head * Insert a new entry after the specified head. * This is good for implementing stacks. */ -#ifndef CONFIG_DEBUG_LIST static inline void list_add(struct list_head *new, struct list_head *head) { __list_add(new, head, head->next); } -#else -extern void list_add(struct list_head *new, struct list_head *head); -#endif /** diff -puN lib/list_debug.c~lists-remove-a-redundant-conditional-definition-of-list_add lib/list_debug.c --- a/lib/list_debug.c~lists-remove-a-redundant-conditional-definition-of-list_add +++ a/lib/list_debug.c @@ -40,20 +40,6 @@ void __list_add(struct list_head *new, EXPORT_SYMBOL(__list_add); /** - * list_add - add a new entry - * @new: new entry to be added - * @head: list head to add it after - * - * Insert a new entry after the specified head. - * This is good for implementing stacks. - */ -void list_add(struct list_head *new, struct list_head *head) -{ - __list_add(new, head, head->next); -} -EXPORT_SYMBOL(list_add); - -/** * list_del - deletes entry from list. * @entry: the element to delete from the list. * Note: list_empty on entry does not return true after this, the entry is _ Patches currently in -mm which might be from rpjday@xxxxxxxxxxxxxx are linux-next.patch xtensa-warn-about-including-asm-rwsemh-directly.patch xtensa-use-newer-__spin_lock_unlocked-macro.patch mn10300-replace-deprecated-topdir-with-newer-srctree.patch remove-apparently-unused-fd1772h-header-file.patch init-delete-hard-coded-setting-and-testing-of-build_cramdisk.patch lib-allow-memparse-to-accept-a-null-and-ignorable-second-parm.patch lib-allow-memparse-to-accept-a-null-and-ignorable-second-parm-checkpatch-fixes.patch lists-remove-a-redundant-conditional-definition-of-list_add.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