The patch titled hrtimers: fix HRTIMER_CB_IRQSAFE_NO_SOFTIRQ description has been added to the -mm tree. Its filename is hrtimers-fix-hrtimer_cb_irqsafe_no_softirq-description.patch *** 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 ------------------------------------------------------ Subject: hrtimers: fix HRTIMER_CB_IRQSAFE_NO_SOFTIRQ description From: Andres Salomon <dilinger@xxxxxxxxxx> The description for HRTIMER_CB_IRQSAFE_NO_SOFTIRQ is backwards; "NO SOFTIRQ" sounds a whole lot like it means it must not be run in a softirq. Signed-off-by: Andres Salomon <dilinger@xxxxxxxxxx> Acked-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/hrtimer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN include/linux/hrtimer.h~hrtimers-fix-hrtimer_cb_irqsafe_no_softirq-description include/linux/hrtimer.h --- a/include/linux/hrtimer.h~hrtimers-fix-hrtimer_cb_irqsafe_no_softirq-description +++ a/include/linux/hrtimer.h @@ -47,7 +47,7 @@ enum hrtimer_restart { * HRTIMER_CB_IRQSAFE: Callback may run in hardirq context * HRTIMER_CB_IRQSAFE_NO_RESTART: Callback may run in hardirq context and * does not restart the timer - * HRTIMER_CB_IRQSAFE_NO_SOFTIRQ: Callback must run in softirq context + * HRTIMER_CB_IRQSAFE_NO_SOFTIRQ: Callback must run in hardirq context * Special mode for tick emultation */ enum hrtimer_cb_mode { _ Patches currently in -mm which might be from dilinger@xxxxxxxxxx are i386-make-x86_64-tsc-header-require-i386-rather-than-vice-versa.patch hrtimers-fix-hrtimer_cb_irqsafe_no_softirq-description.patch hrtimers-hrtimer_clock_base-description-typo.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