2.6.39-stable review patch. If anyone has any objections, please let us know.
------------------ From: "David S. Miller" <[email protected]> [ Upstream commit 6b3678354647a653e669746c05765f05d2b90239 ] Based upon an email by Joe Perches. Reported-by: Randy Dunlap <[email protected]> Signed-off-by: David S. Miller <[email protected]> Acked-by: Randy Dunlap <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> --- include/asm-generic/bug.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) --- a/include/asm-generic/bug.h +++ b/include/asm-generic/bug.h @@ -162,6 +162,8 @@ extern void warn_slowpath_null(const cha unlikely(__ret_warn_once); \ }) +#ifdef CONFIG_PRINTK + #define WARN_ON_RATELIMIT(condition, state) \ WARN_ON((condition) && __ratelimit(state)) @@ -181,6 +183,25 @@ extern void warn_slowpath_null(const cha __WARN_RATELIMIT(condition, &_rs, format); \ }) +#else + +#define WARN_ON_RATELIMIT(condition, state) \ + WARN_ON(condition) + +#define __WARN_RATELIMIT(condition, state, format...) \ +({ \ + int rtn = WARN(condition, format); \ + rtn; \ +}) + +#define WARN_RATELIMIT(condition, format...) \ +({ \ + int rtn = WARN(condition, format); \ + rtn; \ +}) + +#endif + /* * WARN_ON_SMP() is for cases that the warning is either * meaningless for !SMP or may even cause failures. _______________________________________________ stable mailing list [email protected] http://linux.kernel.org/mailman/listinfo/stable
