The patch titled move kernel-doc comment for might_sleep directly before its defining block has been added to the -mm tree. Its filename is move-kernel-doc-comment-for-might_sleep-directly-before-its-defining-block.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: move kernel-doc comment for might_sleep directly before its defining block From: Uwe Kleine-König <Uwe.Kleine-Koenig@xxxxxxxx> Signed-off-by: Uwe Kleine-König <Uwe.Kleine-Koenig@xxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> Cc: Randy Dunlap <randy.dunlap@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/kernel.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff -puN include/linux/kernel.h~move-kernel-doc-comment-for-might_sleep-directly-before-its-defining-block include/linux/kernel.h --- a/include/linux/kernel.h~move-kernel-doc-comment-for-might_sleep-directly-before-its-defining-block +++ a/include/linux/kernel.h @@ -108,6 +108,13 @@ struct completion; struct pt_regs; struct user; +#ifdef CONFIG_PREEMPT_VOLUNTARY +extern int _cond_resched(void); +# define might_resched() _cond_resched() +#else +# define might_resched() do { } while (0) +#endif + /** * might_sleep - annotation for functions that can sleep * @@ -118,13 +125,6 @@ struct user; * be bitten later when the calling function happens to sleep when it is not * supposed to. */ -#ifdef CONFIG_PREEMPT_VOLUNTARY -extern int _cond_resched(void); -# define might_resched() _cond_resched() -#else -# define might_resched() do { } while (0) -#endif - #ifdef CONFIG_DEBUG_SPINLOCK_SLEEP void __might_sleep(char *file, int line); # define might_sleep() \ _ Patches currently in -mm which might be from Uwe.Kleine-Koenig@xxxxxxxx are move-kernel-doc-comment-for-might_sleep-directly-before-its-defining-block.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