The patch titled kernel.h: fix kernel-doc for might_sleep has been added to the -mm tree. Its filename is kernelh-fix-kernel-doc-for-might_sleep.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: kernel.h: fix kernel-doc for might_sleep From: Randy Dunlap <randy.dunlap@xxxxxxxxxx> Put the kernel-doc for might_sleep() _immediately_ before the macro (no intervening lines). Otherwise kernel-doc complains like so: Warning(linux-2.6.27-rc3-git2//include/linux/kernel.h:129): No description found for parameter 'file' Warning(linux-2.6.27-rc3-git2//include/linux/kernel.h:129): No description found for parameter 'line' because kernel-doc is looking at the wrong function prototype (i.e., __might_sleep). [Yes, I have a todo note to myself to check/warn for that inconsistency in scripts/kernel-doc.] Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx> Cc: Uwe Kleine-K_nig <Uwe.Kleine-Koenig@xxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/kernel.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN include/linux/kernel.h~kernelh-fix-kernel-doc-for-might_sleep include/linux/kernel.h --- a/include/linux/kernel.h~kernelh-fix-kernel-doc-for-might_sleep +++ a/include/linux/kernel.h @@ -115,6 +115,8 @@ extern int _cond_resched(void); # define might_resched() do { } while (0) #endif +#ifdef CONFIG_DEBUG_SPINLOCK_SLEEP + void __might_sleep(char *file, int line); /** * might_sleep - annotation for functions that can sleep * @@ -125,8 +127,6 @@ extern int _cond_resched(void); * be bitten later when the calling function happens to sleep when it is not * supposed to. */ -#ifdef CONFIG_DEBUG_SPINLOCK_SLEEP - void __might_sleep(char *file, int line); # define might_sleep() \ do { __might_sleep(__FILE__, __LINE__); might_resched(); } while (0) #else _ Patches currently in -mm which might be from randy.dunlap@xxxxxxxxxx are documentation-describe-bootmem_debug-kernel-parameter.patch kernel-doc-allow-space-in-macro-define.patch kernelh-fix-kernel-doc-for-might_sleep.patch linux-next.patch drm-sis-depends-on-fb_sis.patch genksyms-track-symbol-checksum-changes.patch genksyms-allow-to-ignore-symbol-checksum-changes.patch lkdtm-fix-for-config_scsi=n.patch e1000e-make-e1000e-default-to-the-same-kconfig-setting-as-e1000.patch netfilter-conntrack_helper-needs-to-include-rculisth.patch ftrace-printk-formatting-infrastructure.patch rcu-fix-synchronize_rcu-so-that-kernel-doc-works.patch w1-documentation-w1-masters-ds2490-update.patch profile-likely-unlikely-macros.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