The patch titled jiffies_round -> jiffies_round_relative conversion - rt2x00 has been added to the -mm tree. Its filename is jiffies_round-jiffies_round_relative-conversion-rt2x00.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: jiffies_round -> jiffies_round_relative conversion - rt2x00 From: Anton Blanchard <anton@xxxxxxxxx> When rounding a relative timeout we need to use round_jiffies_relative(). Signed-off-by: Anton Blanchard <anton@xxxxxxxxx> Cc: "John W. Linville" <linville@xxxxxxxxxxxxx> Acked-by: Arjan van de Ven <arjan@xxxxxxxxxxxxxxx> Acked-by: Ivo van Doorn <IvDoorn@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/net/wireless/rt2x00/rt2x00lib.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/net/wireless/rt2x00/rt2x00lib.h~jiffies_round-jiffies_round_relative-conversion-rt2x00 drivers/net/wireless/rt2x00/rt2x00lib.h --- a/drivers/net/wireless/rt2x00/rt2x00lib.h~jiffies_round-jiffies_round_relative-conversion-rt2x00 +++ a/drivers/net/wireless/rt2x00/rt2x00lib.h @@ -30,7 +30,7 @@ * Interval defines * Both the link tuner as the rfkill will be called once per second. */ -#define LINK_TUNE_INTERVAL ( round_jiffies(HZ) ) +#define LINK_TUNE_INTERVAL ( round_jiffies_relative(HZ) ) #define RFKILL_POLL_INTERVAL ( 1000 ) /* _ Patches currently in -mm which might be from anton@xxxxxxxxx are origin.patch git-infiniband.patch jiffies_round-jiffies_round_relative-conversion.patch jiffies_round-jiffies_round_relative-conversion-rt2x00.patch jiffies_round-jiffies_round_relative-conversion-b43-b43legacy.patch drivers-edac-use-round_jiffies_relative.patch jiffies_round-jiffies_round_relative-conversion-in-edac.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