* [PATCH] compat-wireless: avoid pr_fmt build SPAM
@ 2011-11-18 20:54 John W. Linville
2011-11-18 21:00 ` Johannes Berg
2011-11-18 22:26 ` Joe Perches
0 siblings, 2 replies; 9+ messages in thread
From: John W. Linville @ 2011-11-18 20:54 UTC (permalink / raw)
To: linux-wireless; +Cc: Hauke Mehrtens, Luis R. Rodriguez, John W. Linville
The way the compat-* header files are included causes the default
pr_fmt definition from <linux/kernel.h> to be evaluated for every file.
Files that define pr_fmt then generate a lot of build SPAM about
pr_fmt being redefined.
Eliminate the build noise by preemptively undefining pr_fmt in those
files that define it. This is accomplished by adding a patch to the
patches directory.
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---
patches/44-pr_fmt.patch | 346 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 346 insertions(+), 0 deletions(-)
create mode 100644 patches/44-pr_fmt.patch
diff --git a/patches/44-pr_fmt.patch b/patches/44-pr_fmt.patch
new file mode 100644
index 0000000..5c787da
--- /dev/null
+++ b/patches/44-pr_fmt.patch
@@ -0,0 +1,346 @@
+The way the compat-* header files are included causes the default
+pr_fmt definition from <linux/kernel.h> to be evaluated for every file.
+Files that define pr_fmt then generate a lot of build SPAM about
+pr_fmt being redefined.
+
+Eliminate the build noise by preemptively undefining pr_fmt in those
+files that define it.
+
+diff -up compat-wireless-3.2-rc1-1/compat/crc8.c.pr_fmt compat-wireless-3.2-rc1-1/compat/crc8.c
+--- compat-wireless-3.2-rc1-1/compat/crc8.c.pr_fmt 2011-11-18 15:08:04.497812086 -0500
++++ compat-wireless-3.2-rc1-1/compat/crc8.c 2011-11-18 15:20:09.450522691 -0500
+@@ -14,6 +14,7 @@
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+ #include <linux/module.h>
+diff -up compat-wireless-3.2-rc1-1/drivers/bcma/bcma_private.h.pr_fmt compat-wireless-3.2-rc1-1/drivers/bcma/bcma_private.h
+--- compat-wireless-3.2-rc1-1/drivers/bcma/bcma_private.h.pr_fmt 2011-11-18 15:08:04.522323679 -0500
++++ compat-wireless-3.2-rc1-1/drivers/bcma/bcma_private.h 2011-11-18 15:20:09.451522757 -0500
+@@ -1,6 +1,7 @@
+ #ifndef LINUX_BCMA_PRIVATE_H_
+ #define LINUX_BCMA_PRIVATE_H_
+
++#undef pr_fmt
+ #ifndef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+ #endif
+diff -up compat-wireless-3.2-rc1-1/drivers/net/ethernet/broadcom/b44.c.pr_fmt compat-wireless-3.2-rc1-1/drivers/net/ethernet/broadcom/b44.c
+--- compat-wireless-3.2-rc1-1/drivers/net/ethernet/broadcom/b44.c.pr_fmt 2011-11-18 15:08:04.529757401 -0500
++++ compat-wireless-3.2-rc1-1/drivers/net/ethernet/broadcom/b44.c 2011-11-18 15:20:09.453522618 -0500
+@@ -10,6 +10,7 @@
+ * Distribute under GPL.
+ */
+
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+ #include <linux/kernel.h>
+diff -up compat-wireless-3.2-rc1-1/drivers/net/wireless/iwlegacy/iwl3945-base.c.pr_fmt compat-wireless-3.2-rc1-1/drivers/net/wireless/iwlegacy/iwl3945-base.c
+--- compat-wireless-3.2-rc1-1/drivers/net/wireless/iwlegacy/iwl3945-base.c.pr_fmt 2011-11-18 15:08:04.531811389 -0500
++++ compat-wireless-3.2-rc1-1/drivers/net/wireless/iwlegacy/iwl3945-base.c 2011-11-18 15:20:09.455522411 -0500
+@@ -27,6 +27,7 @@
+ *
+ *****************************************************************************/
+
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+ #include <linux/kernel.h>
+diff -up compat-wireless-3.2-rc1-1/drivers/net/wireless/iwlegacy/iwl4965-base.c.pr_fmt compat-wireless-3.2-rc1-1/drivers/net/wireless/iwlegacy/iwl4965-base.c
+--- compat-wireless-3.2-rc1-1/drivers/net/wireless/iwlegacy/iwl4965-base.c.pr_fmt 2011-11-18 15:08:04.533811528 -0500
++++ compat-wireless-3.2-rc1-1/drivers/net/wireless/iwlegacy/iwl4965-base.c 2011-11-18 15:20:09.456520247 -0500
+@@ -27,6 +27,7 @@
+ *
+ *****************************************************************************/
+
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+ #include <linux/kernel.h>
+diff -up compat-wireless-3.2-rc1-1/drivers/net/wireless/libertas/cfg.c.pr_fmt compat-wireless-3.2-rc1-1/drivers/net/wireless/libertas/cfg.c
+--- compat-wireless-3.2-rc1-1/drivers/net/wireless/libertas/cfg.c.pr_fmt 2011-11-18 15:08:04.534811319 -0500
++++ compat-wireless-3.2-rc1-1/drivers/net/wireless/libertas/cfg.c 2011-11-18 15:20:09.456520247 -0500
+@@ -6,6 +6,7 @@
+ *
+ */
+
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+ #include <linux/hardirq.h>
+diff -up compat-wireless-3.2-rc1-1/drivers/net/wireless/libertas/if_cs.c.pr_fmt compat-wireless-3.2-rc1-1/drivers/net/wireless/libertas/if_cs.c
+--- compat-wireless-3.2-rc1-1/drivers/net/wireless/libertas/if_cs.c.pr_fmt 2011-11-18 15:08:04.534811319 -0500
++++ compat-wireless-3.2-rc1-1/drivers/net/wireless/libertas/if_cs.c 2011-11-18 15:20:09.457520945 -0500
+@@ -21,6 +21,7 @@
+
+ */
+
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+ #include <linux/module.h>
+diff -up compat-wireless-3.2-rc1-1/drivers/net/wireless/libertas/if_sdio.c.pr_fmt compat-wireless-3.2-rc1-1/drivers/net/wireless/libertas/if_sdio.c
+--- compat-wireless-3.2-rc1-1/drivers/net/wireless/libertas/if_sdio.c.pr_fmt 2011-11-18 15:08:04.535829198 -0500
++++ compat-wireless-3.2-rc1-1/drivers/net/wireless/libertas/if_sdio.c 2011-11-18 15:20:09.457520945 -0500
+@@ -26,6 +26,7 @@
+ * if_sdio_card_to_host() to pad the data.
+ */
+
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+ #include <linux/kernel.h>
+diff -up compat-wireless-3.2-rc1-1/drivers/net/wireless/libertas/if_spi.c.pr_fmt compat-wireless-3.2-rc1-1/drivers/net/wireless/libertas/if_spi.c
+--- compat-wireless-3.2-rc1-1/drivers/net/wireless/libertas/if_spi.c.pr_fmt 2011-11-18 15:08:04.536811878 -0500
++++ compat-wireless-3.2-rc1-1/drivers/net/wireless/libertas/if_spi.c 2011-11-18 15:20:09.457520945 -0500
+@@ -17,6 +17,7 @@
+ * (at your option) any later version.
+ */
+
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+ #include <linux/hardirq.h>
+diff -up compat-wireless-3.2-rc1-1/drivers/net/wireless/libertas/if_usb.c.pr_fmt compat-wireless-3.2-rc1-1/drivers/net/wireless/libertas/if_usb.c
+--- compat-wireless-3.2-rc1-1/drivers/net/wireless/libertas/if_usb.c.pr_fmt 2011-11-18 15:08:04.536811878 -0500
++++ compat-wireless-3.2-rc1-1/drivers/net/wireless/libertas/if_usb.c 2011-11-18 15:20:09.458521084 -0500
+@@ -2,6 +2,7 @@
+ * This file contains functions used in USB interface module.
+ */
+
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+ #include <linux/delay.h>
+diff -up compat-wireless-3.2-rc1-1/drivers/net/wireless/libertas/main.c.pr_fmt compat-wireless-3.2-rc1-1/drivers/net/wireless/libertas/main.c
+--- compat-wireless-3.2-rc1-1/drivers/net/wireless/libertas/main.c.pr_fmt 2011-11-18 15:08:04.537812436 -0500
++++ compat-wireless-3.2-rc1-1/drivers/net/wireless/libertas/main.c 2011-11-18 15:20:09.458521084 -0500
+@@ -4,6 +4,7 @@
+ * thread etc..
+ */
+
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+ #include <linux/module.h>
+diff -up compat-wireless-3.2-rc1-1/drivers/net/wireless/libertas/mesh.c.pr_fmt compat-wireless-3.2-rc1-1/drivers/net/wireless/libertas/mesh.c
+--- compat-wireless-3.2-rc1-1/drivers/net/wireless/libertas/mesh.c.pr_fmt 2011-11-18 15:08:04.537812436 -0500
++++ compat-wireless-3.2-rc1-1/drivers/net/wireless/libertas/mesh.c 2011-11-18 15:20:09.458521084 -0500
+@@ -1,3 +1,4 @@
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+ #include <linux/delay.h>
+diff -up compat-wireless-3.2-rc1-1/drivers/net/wireless/libertas/rx.c.pr_fmt compat-wireless-3.2-rc1-1/drivers/net/wireless/libertas/rx.c
+--- compat-wireless-3.2-rc1-1/drivers/net/wireless/libertas/rx.c.pr_fmt 2011-11-18 15:08:04.538812017 -0500
++++ compat-wireless-3.2-rc1-1/drivers/net/wireless/libertas/rx.c 2011-11-18 15:20:09.459520455 -0500
+@@ -2,6 +2,7 @@
+ * This file contains the handling of RX in wlan driver.
+ */
+
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+ #include <linux/etherdevice.h>
+diff -up compat-wireless-3.2-rc1-1/drivers/net/wireless/libertas_tf/cmd.c.pr_fmt compat-wireless-3.2-rc1-1/drivers/net/wireless/libertas_tf/cmd.c
+--- compat-wireless-3.2-rc1-1/drivers/net/wireless/libertas_tf/cmd.c.pr_fmt 2011-11-18 15:08:04.544819700 -0500
++++ compat-wireless-3.2-rc1-1/drivers/net/wireless/libertas_tf/cmd.c 2011-11-18 15:20:09.459520455 -0500
+@@ -7,6 +7,7 @@
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ */
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+ #include <linux/hardirq.h>
+diff -up compat-wireless-3.2-rc1-1/drivers/net/wireless/libertas_tf/if_usb.c.pr_fmt compat-wireless-3.2-rc1-1/drivers/net/wireless/libertas_tf/if_usb.c
+--- compat-wireless-3.2-rc1-1/drivers/net/wireless/libertas_tf/if_usb.c.pr_fmt 2011-11-18 15:08:04.545747064 -0500
++++ compat-wireless-3.2-rc1-1/drivers/net/wireless/libertas_tf/if_usb.c 2011-11-18 15:20:09.459520455 -0500
+@@ -9,6 +9,7 @@
+ */
+ #define DRV_NAME "lbtf_usb"
+
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+ #include "libertas_tf.h"
+diff -up compat-wireless-3.2-rc1-1/drivers/net/wireless/libertas_tf/main.c.pr_fmt compat-wireless-3.2-rc1-1/drivers/net/wireless/libertas_tf/main.c
+--- compat-wireless-3.2-rc1-1/drivers/net/wireless/libertas_tf/main.c.pr_fmt 2011-11-18 15:08:04.545747064 -0500
++++ compat-wireless-3.2-rc1-1/drivers/net/wireless/libertas_tf/main.c 2011-11-18 15:20:09.459520455 -0500
+@@ -7,6 +7,7 @@
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ */
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+ #include <linux/hardirq.h>
+diff -up compat-wireless-3.2-rc1-1/drivers/net/wireless/rtlwifi/base.c.pr_fmt compat-wireless-3.2-rc1-1/drivers/net/wireless/rtlwifi/base.c
+--- compat-wireless-3.2-rc1-1/drivers/net/wireless/rtlwifi/base.c.pr_fmt 2011-11-18 15:08:04.565011903 -0500
++++ compat-wireless-3.2-rc1-1/drivers/net/wireless/rtlwifi/base.c 2011-11-18 15:20:55.315644844 -0500
+@@ -27,6 +27,7 @@
+ *
+ *****************************************************************************/
+
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+ #include <linux/ip.h>
+diff -up compat-wireless-3.2-rc1-1/drivers/net/wireless/rtlwifi/cam.c.pr_fmt compat-wireless-3.2-rc1-1/drivers/net/wireless/rtlwifi/cam.c
+--- compat-wireless-3.2-rc1-1/drivers/net/wireless/rtlwifi/cam.c.pr_fmt 2011-11-18 15:08:04.565812364 -0500
++++ compat-wireless-3.2-rc1-1/drivers/net/wireless/rtlwifi/cam.c 2011-11-18 15:20:55.322652946 -0500
+@@ -27,6 +27,7 @@
+ *
+ *****************************************************************************/
+
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+ #include <linux/export.h>
+diff -up compat-wireless-3.2-rc1-1/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c.pr_fmt compat-wireless-3.2-rc1-1/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
+--- compat-wireless-3.2-rc1-1/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c.pr_fmt 2011-11-18 15:08:04.565812364 -0500
++++ compat-wireless-3.2-rc1-1/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c 2011-11-18 15:20:55.334647078 -0500
+@@ -27,6 +27,7 @@
+ *
+ *****************************************************************************/
+
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+ #include <linux/firmware.h>
+diff -up compat-wireless-3.2-rc1-1/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c.pr_fmt compat-wireless-3.2-rc1-1/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
+--- compat-wireless-3.2-rc1-1/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c.pr_fmt 2011-11-18 15:08:04.567811877 -0500
++++ compat-wireless-3.2-rc1-1/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c 2011-11-18 15:20:55.341625637 -0500
+@@ -27,6 +27,7 @@
+ *
+ *****************************************************************************/
+
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+ #include "../wifi.h"
+diff -up compat-wireless-3.2-rc1-1/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c.pr_fmt compat-wireless-3.2-rc1-1/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c
+--- compat-wireless-3.2-rc1-1/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c.pr_fmt 2011-11-18 15:08:04.567811877 -0500
++++ compat-wireless-3.2-rc1-1/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c 2011-11-18 15:20:55.342644635 -0500
+@@ -27,6 +27,7 @@
+ *
+ ****************************************************************************/
+
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+ #include <linux/module.h>
+diff -up compat-wireless-3.2-rc1-1/drivers/net/wireless/rtlwifi/rtl8192de/sw.c.pr_fmt compat-wireless-3.2-rc1-1/drivers/net/wireless/rtlwifi/rtl8192de/sw.c
+--- compat-wireless-3.2-rc1-1/drivers/net/wireless/rtlwifi/rtl8192de/sw.c.pr_fmt 2011-11-18 15:08:04.568814042 -0500
++++ compat-wireless-3.2-rc1-1/drivers/net/wireless/rtlwifi/rtl8192de/sw.c 2011-11-18 15:20:55.350617325 -0500
+@@ -27,6 +27,7 @@
+ *
+ *****************************************************************************/
+
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+ #include <linux/vmalloc.h>
+diff -up compat-wireless-3.2-rc1-1/drivers/net/wireless/rtlwifi/rtl8192se/hw.c.pr_fmt compat-wireless-3.2-rc1-1/drivers/net/wireless/rtlwifi/rtl8192se/hw.c
+--- compat-wireless-3.2-rc1-1/drivers/net/wireless/rtlwifi/rtl8192se/hw.c.pr_fmt 2011-11-18 15:08:04.569828848 -0500
++++ compat-wireless-3.2-rc1-1/drivers/net/wireless/rtlwifi/rtl8192se/hw.c 2011-11-18 15:20:55.358645682 -0500
+@@ -27,6 +27,7 @@
+ *
+ *****************************************************************************/
+
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+ #include "../wifi.h"
+diff -up compat-wireless-3.2-rc1-1/drivers/net/wireless/rtlwifi/rtl8192se/phy.c.pr_fmt compat-wireless-3.2-rc1-1/drivers/net/wireless/rtlwifi/rtl8192se/phy.c
+--- compat-wireless-3.2-rc1-1/drivers/net/wireless/rtlwifi/rtl8192se/phy.c.pr_fmt 2011-11-18 15:08:04.570818023 -0500
++++ compat-wireless-3.2-rc1-1/drivers/net/wireless/rtlwifi/rtl8192se/phy.c 2011-11-18 15:20:55.365635904 -0500
+@@ -27,6 +27,7 @@
+ *
+ *****************************************************************************/
+
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+ #include "../wifi.h"
+diff -up compat-wireless-3.2-rc1-1/drivers/net/wireless/rtlwifi/rtl8192se/rf.c.pr_fmt compat-wireless-3.2-rc1-1/drivers/net/wireless/rtlwifi/rtl8192se/rf.c
+--- compat-wireless-3.2-rc1-1/drivers/net/wireless/rtlwifi/rtl8192se/rf.c.pr_fmt 2011-11-18 15:08:04.571812156 -0500
++++ compat-wireless-3.2-rc1-1/drivers/net/wireless/rtlwifi/rtl8192se/rf.c 2011-11-18 15:20:55.371549230 -0500
+@@ -27,6 +27,7 @@
+ *
+ *****************************************************************************/
+
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+ #include "../wifi.h"
+diff -up compat-wireless-3.2-rc1-1/drivers/net/wireless/rtlwifi/rtl8192se/sw.c.pr_fmt compat-wireless-3.2-rc1-1/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
+--- compat-wireless-3.2-rc1-1/drivers/net/wireless/rtlwifi/rtl8192se/sw.c.pr_fmt 2011-11-18 15:08:04.571812156 -0500
++++ compat-wireless-3.2-rc1-1/drivers/net/wireless/rtlwifi/rtl8192se/sw.c 2011-11-18 15:20:55.379720621 -0500
+@@ -27,6 +27,7 @@
+ *
+ *****************************************************************************/
+
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+ #include <linux/vmalloc.h>
+diff -up compat-wireless-3.2-rc1-1/drivers/net/wireless/rtlwifi/usb.c.pr_fmt compat-wireless-3.2-rc1-1/drivers/net/wireless/rtlwifi/usb.c
+--- compat-wireless-3.2-rc1-1/drivers/net/wireless/rtlwifi/usb.c.pr_fmt 2011-11-18 15:08:04.572718638 -0500
++++ compat-wireless-3.2-rc1-1/drivers/net/wireless/rtlwifi/usb.c 2011-11-18 15:20:55.389173129 -0500
+@@ -25,6 +25,7 @@
+ *
+ *****************************************************************************/
+
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+ #include <linux/usb.h>
+diff -up compat-wireless-3.2-rc1-1/net/wireless/core.c.pr_fmt compat-wireless-3.2-rc1-1/net/wireless/core.c
+--- compat-wireless-3.2-rc1-1/net/wireless/core.c.pr_fmt 2011-11-18 15:08:04.573774302 -0500
++++ compat-wireless-3.2-rc1-1/net/wireless/core.c 2011-11-18 15:20:55.395647078 -0500
+@@ -4,6 +4,7 @@
+ * Copyright 2006-2010 Johannes Berg <johannes@sipsolutions.net>
+ */
+
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+ #include <linux/if.h>
+diff -up compat-wireless-3.2-rc1-1/net/wireless/lib80211.c.pr_fmt compat-wireless-3.2-rc1-1/net/wireless/lib80211.c
+--- compat-wireless-3.2-rc1-1/net/wireless/lib80211.c.pr_fmt 2011-11-18 15:08:04.573774302 -0500
++++ compat-wireless-3.2-rc1-1/net/wireless/lib80211.c 2011-11-18 15:20:55.405646450 -0500
+@@ -13,6 +13,7 @@
+ *
+ */
+
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+ #include <linux/module.h>
+diff -up compat-wireless-3.2-rc1-1/net/wireless/lib80211_crypt_tkip.c.pr_fmt compat-wireless-3.2-rc1-1/net/wireless/lib80211_crypt_tkip.c
+--- compat-wireless-3.2-rc1-1/net/wireless/lib80211_crypt_tkip.c.pr_fmt 2011-11-18 15:08:04.574811667 -0500
++++ compat-wireless-3.2-rc1-1/net/wireless/lib80211_crypt_tkip.c 2011-11-18 15:20:55.406648475 -0500
+@@ -10,6 +10,7 @@
+ * more details.
+ */
+
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+ #include <linux/err.h>
+diff -up compat-wireless-3.2-rc1-1/net/wireless/reg.c.pr_fmt compat-wireless-3.2-rc1-1/net/wireless/reg.c
+--- compat-wireless-3.2-rc1-1/net/wireless/reg.c.pr_fmt 2011-11-18 15:08:04.575716473 -0500
++++ compat-wireless-3.2-rc1-1/net/wireless/reg.c 2011-11-18 15:20:55.408647986 -0500
+@@ -33,6 +33,7 @@
+ *
+ */
+
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+ #include <linux/kernel.h>
--
1.7.4.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH] compat-wireless: avoid pr_fmt build SPAM
2011-11-18 20:54 [PATCH] compat-wireless: avoid pr_fmt build SPAM John W. Linville
@ 2011-11-18 21:00 ` Johannes Berg
2011-11-18 21:09 ` John W. Linville
2011-11-18 21:12 ` Luis R. Rodriguez
2011-11-18 22:26 ` Joe Perches
1 sibling, 2 replies; 9+ messages in thread
From: Johannes Berg @ 2011-11-18 21:00 UTC (permalink / raw)
To: John W. Linville; +Cc: linux-wireless, Hauke Mehrtens, Luis R. Rodriguez
On Fri, 2011-11-18 at 15:54 -0500, John W. Linville wrote:
> The way the compat-* header files are included causes the default
> pr_fmt definition from <linux/kernel.h> to be evaluated for every file.
> Files that define pr_fmt then generate a lot of build SPAM about
> pr_fmt being redefined.
>
> Eliminate the build noise by preemptively undefining pr_fmt in those
> files that define it. This is accomplished by adding a patch to the
> patches directory.
This patch is going to be relatively painful when files move etc -- is
that really worth it? I for one will just drop it in our compat version
if it goes in since I don't even have all the files it patches :-)
johannes
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] compat-wireless: avoid pr_fmt build SPAM
2011-11-18 21:00 ` Johannes Berg
@ 2011-11-18 21:09 ` John W. Linville
2011-11-18 21:12 ` Luis R. Rodriguez
1 sibling, 0 replies; 9+ messages in thread
From: John W. Linville @ 2011-11-18 21:09 UTC (permalink / raw)
To: Johannes Berg; +Cc: linux-wireless, Hauke Mehrtens, Luis R. Rodriguez
On Fri, Nov 18, 2011 at 10:00:12PM +0100, Johannes Berg wrote:
> On Fri, 2011-11-18 at 15:54 -0500, John W. Linville wrote:
> > The way the compat-* header files are included causes the default
> > pr_fmt definition from <linux/kernel.h> to be evaluated for every file.
> > Files that define pr_fmt then generate a lot of build SPAM about
> > pr_fmt being redefined.
> >
> > Eliminate the build noise by preemptively undefining pr_fmt in those
> > files that define it. This is accomplished by adding a patch to the
> > patches directory.
>
> This patch is going to be relatively painful when files move etc -- is
> that really worth it? I for one will just drop it in our compat version
> if it goes in since I don't even have all the files it patches :-)
I don't know how much those definitions will move, since they are
rooted to the tops of those files anyway. If the files move or
whatever there will be some flux. But then you'll be no worse-off
than we are now for that file, and hopefully only a few hunks will
have problems at any given time.
Personally, I hate seeing all those warnings fly-by. It is even worse
when you know you are building backported code, where my experience
suggests that warnings are more likely to be revealing real problems.
Having all that SPAM about pr_fmt being redefined is just encouraging
us to ignore what might otherwise be legitimate warnings.
These hunks are one-liners that I predict will change rarely and
which are obvious to move or to add to new files. I'd rather have
this patch than not.
John
P.S. I'll see your threat to drop the patch at Intel and I'll raise
it with my threat to add the patch to Fedora. :-)
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] compat-wireless: avoid pr_fmt build SPAM
2011-11-18 21:00 ` Johannes Berg
2011-11-18 21:09 ` John W. Linville
@ 2011-11-18 21:12 ` Luis R. Rodriguez
2011-11-18 21:49 ` John W. Linville
1 sibling, 1 reply; 9+ messages in thread
From: Luis R. Rodriguez @ 2011-11-18 21:12 UTC (permalink / raw)
To: Johannes Berg, Julia Lawall, Jesper Andersen
Cc: John W. Linville, linux-wireless, Hauke Mehrtens
On Fri, Nov 18, 2011 at 1:00 PM, Johannes Berg
<johannes@sipsolutions.net> wrote:
> On Fri, 2011-11-18 at 15:54 -0500, John W. Linville wrote:
>> The way the compat-* header files are included causes the default
>> pr_fmt definition from <linux/kernel.h> to be evaluated for every file.
>> Files that define pr_fmt then generate a lot of build SPAM about
>> pr_fmt being redefined.
>>
>> Eliminate the build noise by preemptively undefining pr_fmt in those
>> files that define it. This is accomplished by adding a patch to the
>> patches directory.
>
> This patch is going to be relatively painful when files move etc -- is
> that really worth it? I for one will just drop it in our compat version
> if it goes in since I don't even have all the files it patches :-)
This may be a good use case for spatch magic?
Luis
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] compat-wireless: avoid pr_fmt build SPAM
2011-11-18 21:12 ` Luis R. Rodriguez
@ 2011-11-18 21:49 ` John W. Linville
0 siblings, 0 replies; 9+ messages in thread
From: John W. Linville @ 2011-11-18 21:49 UTC (permalink / raw)
To: Luis R. Rodriguez
Cc: Johannes Berg, Julia Lawall, Jesper Andersen, linux-wireless,
Hauke Mehrtens
On Fri, Nov 18, 2011 at 01:12:51PM -0800, Luis R. Rodriguez wrote:
> On Fri, Nov 18, 2011 at 1:00 PM, Johannes Berg
> <johannes@sipsolutions.net> wrote:
> > On Fri, 2011-11-18 at 15:54 -0500, John W. Linville wrote:
> >> The way the compat-* header files are included causes the default
> >> pr_fmt definition from <linux/kernel.h> to be evaluated for every file.
> >> Files that define pr_fmt then generate a lot of build SPAM about
> >> pr_fmt being redefined.
> >>
> >> Eliminate the build noise by preemptively undefining pr_fmt in those
> >> files that define it. This is accomplished by adding a patch to the
> >> patches directory.
> >
> > This patch is going to be relatively painful when files move etc -- is
> > that really worth it? I for one will just drop it in our compat version
> > if it goes in since I don't even have all the files it patches :-)
>
> This may be a good use case for spatch magic?
Yeah, I was thinking exactly that. I haven't tried spatch yet,
but it would probably handle this fairly well.
Are you using it anywhere else?
John
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] compat-wireless: avoid pr_fmt build SPAM
2011-11-18 20:54 [PATCH] compat-wireless: avoid pr_fmt build SPAM John W. Linville
2011-11-18 21:00 ` Johannes Berg
@ 2011-11-18 22:26 ` Joe Perches
2011-11-18 22:34 ` John W. Linville
1 sibling, 1 reply; 9+ messages in thread
From: Joe Perches @ 2011-11-18 22:26 UTC (permalink / raw)
To: John W. Linville; +Cc: linux-wireless, Hauke Mehrtens, Luis R. Rodriguez
On Fri, 2011-11-18 at 15:54 -0500, John W. Linville wrote:
> The way the compat-* header files are included causes the default
> pr_fmt definition from <linux/kernel.h> to be evaluated for every file.
> Files that define pr_fmt then generate a lot of build SPAM about
> pr_fmt being redefined.
>
> Eliminate the build noise by preemptively undefining pr_fmt in those
> files that define it. This is accomplished by adding a patch to the
> patches directory.
Why not undef pr_fmt after the compat-* headers?
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] compat-wireless: avoid pr_fmt build SPAM
2011-11-18 22:26 ` Joe Perches
@ 2011-11-18 22:34 ` John W. Linville
2011-11-18 23:03 ` Luis R. Rodriguez
0 siblings, 1 reply; 9+ messages in thread
From: John W. Linville @ 2011-11-18 22:34 UTC (permalink / raw)
To: Joe Perches; +Cc: linux-wireless, Hauke Mehrtens, Luis R. Rodriguez
On Fri, Nov 18, 2011 at 02:26:21PM -0800, Joe Perches wrote:
> On Fri, 2011-11-18 at 15:54 -0500, John W. Linville wrote:
> > The way the compat-* header files are included causes the default
> > pr_fmt definition from <linux/kernel.h> to be evaluated for every file.
> > Files that define pr_fmt then generate a lot of build SPAM about
> > pr_fmt being redefined.
> >
> > Eliminate the build noise by preemptively undefining pr_fmt in those
> > files that define it. This is accomplished by adding a patch to the
> > patches directory.
>
> Why not undef pr_fmt after the compat-* headers?
That caused a build break. IIRC, not everyone that uses pr_*
defines pr_fmt. If pr_fmt is undef'd then they don't compile.
John
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] compat-wireless: avoid pr_fmt build SPAM
2011-11-18 22:34 ` John W. Linville
@ 2011-11-18 23:03 ` Luis R. Rodriguez
2011-11-18 23:21 ` Hauke Mehrtens
0 siblings, 1 reply; 9+ messages in thread
From: Luis R. Rodriguez @ 2011-11-18 23:03 UTC (permalink / raw)
To: John W. Linville; +Cc: Joe Perches, linux-wireless, Hauke Mehrtens
On Fri, Nov 18, 2011 at 2:34 PM, John W. Linville
<linville@tuxdriver.com> wrote:
> On Fri, Nov 18, 2011 at 02:26:21PM -0800, Joe Perches wrote:
>> On Fri, 2011-11-18 at 15:54 -0500, John W. Linville wrote:
>> > The way the compat-* header files are included causes the default
>> > pr_fmt definition from <linux/kernel.h> to be evaluated for every file.
>> > Files that define pr_fmt then generate a lot of build SPAM about
>> > pr_fmt being redefined.
>> >
>> > Eliminate the build noise by preemptively undefining pr_fmt in those
>> > files that define it. This is accomplished by adding a patch to the
>> > patches directory.
>>
>> Why not undef pr_fmt after the compat-* headers?
>
> That caused a build break. IIRC, not everyone that uses pr_*
> defines pr_fmt. If pr_fmt is undef'd then they don't compile.
Hm, would it work if we undef but then define it?
Luis
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] compat-wireless: avoid pr_fmt build SPAM
2011-11-18 23:03 ` Luis R. Rodriguez
@ 2011-11-18 23:21 ` Hauke Mehrtens
0 siblings, 0 replies; 9+ messages in thread
From: Hauke Mehrtens @ 2011-11-18 23:21 UTC (permalink / raw)
To: Luis R. Rodriguez; +Cc: John W. Linville, Joe Perches, linux-wireless
On 11/19/2011 12:03 AM, Luis R. Rodriguez wrote:
> On Fri, Nov 18, 2011 at 2:34 PM, John W. Linville
> <linville@tuxdriver.com> wrote:
>> On Fri, Nov 18, 2011 at 02:26:21PM -0800, Joe Perches wrote:
>>> On Fri, 2011-11-18 at 15:54 -0500, John W. Linville wrote:
>>>> The way the compat-* header files are included causes the default
>>>> pr_fmt definition from <linux/kernel.h> to be evaluated for every file.
>>>> Files that define pr_fmt then generate a lot of build SPAM about
>>>> pr_fmt being redefined.
>>>>
>>>> Eliminate the build noise by preemptively undefining pr_fmt in those
>>>> files that define it. This is accomplished by adding a patch to the
>>>> patches directory.
>>>
>>> Why not undef pr_fmt after the compat-* headers?
>>
>> That caused a build break. IIRC, not everyone that uses pr_*
>> defines pr_fmt. If pr_fmt is undef'd then they don't compile.
>
> Hm, would it work if we undef but then define it?
>
> Luis
We could restructure compat so that it will not include everything every
time. Some time ago I tried to the extend every header with the things
needed to backport and remove the compat-*.h files completely.
The headers looked like this ( e.g. for include/linux/kernel.h):
#include <linux/version.h>
#include_next <linux/kernel.h>
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36))
.. backport code for this kernel
#endif
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35))
.. backport code for this kernel
#endif
....
Then just the headers needed at that position are included and we would
not have this problem with pr_fmt, but it takes some time to do this.
Hauke
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2011-11-18 23:21 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-18 20:54 [PATCH] compat-wireless: avoid pr_fmt build SPAM John W. Linville
2011-11-18 21:00 ` Johannes Berg
2011-11-18 21:09 ` John W. Linville
2011-11-18 21:12 ` Luis R. Rodriguez
2011-11-18 21:49 ` John W. Linville
2011-11-18 22:26 ` Joe Perches
2011-11-18 22:34 ` John W. Linville
2011-11-18 23:03 ` Luis R. Rodriguez
2011-11-18 23:21 ` Hauke Mehrtens
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).