This is a note to let you know that I've just added the patch titled
bug.h: Fix build with CONFIG_PRINTK disabled.
to the 2.6.39-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
bug.h-fix-build-with-config_printk-disabled.patch
and it can be found in the queue-2.6.39 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From f6f81b9cf25027b0a8f25a7107df748bdaa29523 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <[email protected]>
Date: Tue, 24 May 2011 16:15:41 -0400
Subject: bug.h: Fix build with CONFIG_PRINTK disabled.
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.
Patches currently in stable-queue which might be from [email protected] are
queue-2.6.39/udp-recvmsg-clear-msg_trunc-flag-when-starting-over-for-a-new-packet.patch
queue-2.6.39/net-filter-use-warn_ratelimit.patch
queue-2.6.39/inetpeer-fix-race-in-unused_list-manipulations.patch
queue-2.6.39/bug.h-fix-build-with-config_printk-disabled.patch
queue-2.6.39/af_packet-prevent-information-leak.patch
queue-2.6.39/ipv6-udp-use-the-correct-variable-to-determine-non-blocking-condition.patch
queue-2.6.39/bug.h-add-warn_ratelimit.patch
queue-2.6.39/bug.h-move-ratelimit-warn-interfaces-to-ratelimit.h.patch
queue-2.6.39/bridge-provide-a-cow_metrics-method-for-fake_ops.patch
queue-2.6.39/net-fix-ethtool_sfeatures-compatibility-with-old-ethtool_ops.set_flags.patch
queue-2.6.39/net-ipv4-check-for-mistakenly-passed-in-non-ipv4-address.patch
queue-2.6.39/inet_diag-fix-inet_diag_bc_audit.patch
_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable
