From fa580e5210c9e6f83a673a05d0a87ecd787fe4c4 Mon Sep 17 00:00:00 2001 From: "John W. Linville" Date: Tue, 13 Mar 2012 13:26:37 -0400 Subject: [PATCH] Remove infrastructure related to compat-wireless integration --- compat-wireless-config-fixups.patch | 72 --- compat-wireless-integrated-build.patch | 12 - ...at-wireless-pr_fmt-warning-avoidance.patch | 611 ------------------ config-backports | 24 - kernel.spec | 114 +--- ...on-to-allow-external-modules-to-avoi.patch | 80 --- sources | 1 - 7 files changed, 12 insertions(+), 902 deletions(-) delete mode 100644 compat-wireless-config-fixups.patch delete mode 100644 compat-wireless-integrated-build.patch delete mode 100644 compat-wireless-pr_fmt-warning-avoidance.patch delete mode 100644 config-backports delete mode 100644 modpost-add-option-to-allow-external-modules-to-avoi.patch diff --git a/compat-wireless-config-fixups.patch b/compat-wireless-config-fixups.patch deleted file mode 100644 index f74dbd2d5..000000000 --- a/compat-wireless-config-fixups.patch +++ /dev/null @@ -1,72 +0,0 @@ -diff -up compat-wireless-2012-02-05/config.mk.orig compat-wireless-2012-02-05/config.mk ---- compat-wireless-2012-02-05/config.mk.orig 2012-02-05 16:10:31.000000000 -0500 -+++ compat-wireless-2012-02-05/config.mk 2012-02-06 11:43:46.142222712 -0500 -@@ -14,6 +14,9 @@ else - include $(KLIB_BUILD)/.config - endif - -+# Enable SSB module (needs to be visible in compat_autoconf.h) -+CONFIG_SSB=m -+ - ifneq ($(wildcard $(KLIB_BUILD)/Makefile),) - - COMPAT_LATEST_VERSION = 3 -diff -up compat-wireless-2012-02-05/drivers/misc/eeprom/Makefile.orig compat-wireless-2012-02-05/drivers/misc/eeprom/Makefile ---- compat-wireless-2012-02-05/drivers/misc/eeprom/Makefile.orig 2012-02-05 16:10:39.000000000 -0500 -+++ compat-wireless-2012-02-05/drivers/misc/eeprom/Makefile 2012-02-06 11:43:46.143222699 -0500 -@@ -1 +1 @@ --obj-$(CONFIG_EEPROM_93CX6) += eeprom_93cx6.o -+#obj-$(CONFIG_EEPROM_93CX6) += eeprom_93cx6.o -diff -up compat-wireless-2012-02-05/drivers/net/ethernet/atheros/Makefile.orig compat-wireless-2012-02-05/drivers/net/ethernet/atheros/Makefile ---- compat-wireless-2012-02-05/drivers/net/ethernet/atheros/Makefile.orig 2012-02-05 16:10:37.000000000 -0500 -+++ compat-wireless-2012-02-05/drivers/net/ethernet/atheros/Makefile 2012-02-06 11:43:46.143222699 -0500 -@@ -2,7 +2,7 @@ - # Makefile for the Atheros network device drivers. - # - --obj-$(CONFIG_ATL1) += atlx/ --obj-$(CONFIG_ATL2) += atlx/ --obj-$(CONFIG_ATL1E) += atl1e/ --obj-$(CONFIG_ATL1C) += atl1c/ -+#obj-$(CONFIG_ATL1) += atlx/ -+#obj-$(CONFIG_ATL2) += atlx/ -+#obj-$(CONFIG_ATL1E) += atl1e/ -+#obj-$(CONFIG_ATL1C) += atl1c/ -diff -up compat-wireless-2012-02-05/drivers/net/usb/Makefile.orig compat-wireless-2012-02-05/drivers/net/usb/Makefile ---- compat-wireless-2012-02-05/drivers/net/usb/Makefile.orig 2012-02-05 16:10:39.000000000 -0500 -+++ compat-wireless-2012-02-05/drivers/net/usb/Makefile 2012-02-06 11:45:23.531005184 -0500 -@@ -2,6 +2,6 @@ - # Makefile for USB Network drivers - # - --obj-$(CONFIG_USB_NET_COMPAT_CDCETHER) += cdc_ether.o --obj-$(CONFIG_USB_NET_COMPAT_RNDIS_HOST) += rndis_host.o --obj-$(CONFIG_USB_COMPAT_USBNET) += usbnet.o -+#obj-$(CONFIG_USB_NET_COMPAT_CDCETHER) += cdc_ether.o -+#obj-$(CONFIG_USB_NET_COMPAT_RNDIS_HOST) += rndis_host.o -+#obj-$(CONFIG_USB_COMPAT_USBNET) += usbnet.o -diff -up compat-wireless-2012-02-05/Makefile.orig compat-wireless-2012-02-05/Makefile ---- compat-wireless-2012-02-05/Makefile.orig 2012-02-05 16:10:31.000000000 -0500 -+++ compat-wireless-2012-02-05/Makefile 2012-02-06 11:43:46.145222675 -0500 -@@ -10,8 +10,8 @@ export KLIB_BUILD ?= $(KLIB)/build - MODPROBE := /sbin/modprobe - - ifneq ($(wildcard $(MODPROBE)),) --MADWIFI=$(shell $(MODPROBE) -l ath_pci) --OLD_IWL=$(shell $(MODPROBE) -l iwl4965) -+MADWIFI="" -+OLD_IWL="" - endif - - DESTDIR?= -@@ -44,8 +44,8 @@ endif - - endif - --obj-$(CONFIG_COMPAT_BLUETOOTH) += net/bluetooth/ --obj-$(CONFIG_COMPAT_BLUETOOTH_MODULES) += drivers/bluetooth/ -+#obj-$(CONFIG_COMPAT_BLUETOOTH) += net/bluetooth/ -+#obj-$(CONFIG_COMPAT_BLUETOOTH_MODULES) += drivers/bluetooth/ - - else - diff --git a/compat-wireless-integrated-build.patch b/compat-wireless-integrated-build.patch deleted file mode 100644 index 1d08e4b58..000000000 --- a/compat-wireless-integrated-build.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up compat-wireless-2011-12-01/Makefile.orig compat-wireless-2011-12-01/Makefile ---- compat-wireless-2011-12-01/Makefile.orig 2011-12-14 09:10:01.377297637 -0500 -+++ compat-wireless-2011-12-01/Makefile 2011-12-14 09:47:36.834100534 -0500 -@@ -68,7 +68,7 @@ all: modules - - modules: $(CREL_CHECK) - @./scripts/check_config.sh -- $(MAKE) -C $(KLIB_BUILD) M=$(PWD) modules -+ $(MAKE) -C $(KLIB_BUILD) M=$(PWD) INTEGRATED_BUILD=1 modules - @touch $@ - - bt: $(CREL_CHECK) diff --git a/compat-wireless-pr_fmt-warning-avoidance.patch b/compat-wireless-pr_fmt-warning-avoidance.patch deleted file mode 100644 index 6dbbc82e8..000000000 --- a/compat-wireless-pr_fmt-warning-avoidance.patch +++ /dev/null @@ -1,611 +0,0 @@ -diff -up compat-wireless-2012-02-05/compat/crc8.c.orig compat-wireless-2012-02-05/compat/crc8.c ---- compat-wireless-2012-02-05/compat/crc8.c.orig 2012-02-05 16:10:38.000000000 -0500 -+++ compat-wireless-2012-02-05/compat/crc8.c 2012-02-06 11:53:01.617278318 -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 -diff -up compat-wireless-2012-02-05/drivers/bcma/bcma_private.h.orig compat-wireless-2012-02-05/drivers/bcma/bcma_private.h ---- compat-wireless-2012-02-05/drivers/bcma/bcma_private.h.orig 2012-02-05 16:10:33.000000000 -0500 -+++ compat-wireless-2012-02-05/drivers/bcma/bcma_private.h 2012-02-06 11:53:01.618278306 -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-2012-02-05/drivers/net/ethernet/broadcom/b44.c.orig compat-wireless-2012-02-05/drivers/net/ethernet/broadcom/b44.c ---- compat-wireless-2012-02-05/drivers/net/ethernet/broadcom/b44.c.orig 2012-02-05 16:10:38.000000000 -0500 -+++ compat-wireless-2012-02-05/drivers/net/ethernet/broadcom/b44.c 2012-02-06 11:53:01.620278282 -0500 -@@ -10,6 +10,7 @@ - * Distribute under GPL. - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include -diff -up compat-wireless-2012-02-05/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c.orig compat-wireless-2012-02-05/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c ---- compat-wireless-2012-02-05/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c.orig 2012-02-05 16:10:33.000000000 -0500 -+++ compat-wireless-2012-02-05/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c 2012-02-06 11:53:01.621278269 -0500 -@@ -16,6 +16,7 @@ - * File contents: support functions for PCI/PCIe - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include -diff -up compat-wireless-2012-02-05/drivers/net/wireless/brcm80211/brcmsmac/dma.c.orig compat-wireless-2012-02-05/drivers/net/wireless/brcm80211/brcmsmac/dma.c ---- compat-wireless-2012-02-05/drivers/net/wireless/brcm80211/brcmsmac/dma.c.orig 2012-02-05 16:10:33.000000000 -0500 -+++ compat-wireless-2012-02-05/drivers/net/wireless/brcm80211/brcmsmac/dma.c 2012-02-06 11:53:01.622278256 -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 -diff -up compat-wireless-2012-02-05/drivers/net/wireless/iwlegacy/3945-mac.c.orig compat-wireless-2012-02-05/drivers/net/wireless/iwlegacy/3945-mac.c ---- compat-wireless-2012-02-05/drivers/net/wireless/iwlegacy/3945-mac.c.orig 2012-02-05 16:10:38.000000000 -0500 -+++ compat-wireless-2012-02-05/drivers/net/wireless/iwlegacy/3945-mac.c 2012-02-06 11:53:01.625278218 -0500 -@@ -27,6 +27,7 @@ - * - *****************************************************************************/ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include -diff -up compat-wireless-2012-02-05/drivers/net/wireless/iwlegacy/4965-mac.c.orig compat-wireless-2012-02-05/drivers/net/wireless/iwlegacy/4965-mac.c ---- compat-wireless-2012-02-05/drivers/net/wireless/iwlegacy/4965-mac.c.orig 2012-02-05 16:10:38.000000000 -0500 -+++ compat-wireless-2012-02-05/drivers/net/wireless/iwlegacy/4965-mac.c 2012-02-06 11:53:01.630278156 -0500 -@@ -27,6 +27,7 @@ - * - *****************************************************************************/ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include -diff -up compat-wireless-2012-02-05/drivers/net/wireless/libertas/cfg.c.orig compat-wireless-2012-02-05/drivers/net/wireless/libertas/cfg.c ---- compat-wireless-2012-02-05/drivers/net/wireless/libertas/cfg.c.orig 2012-02-05 16:10:35.000000000 -0500 -+++ compat-wireless-2012-02-05/drivers/net/wireless/libertas/cfg.c 2012-02-06 11:53:01.630278156 -0500 -@@ -6,6 +6,7 @@ - * - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include -diff -up compat-wireless-2012-02-05/drivers/net/wireless/libertas/if_cs.c.orig compat-wireless-2012-02-05/drivers/net/wireless/libertas/if_cs.c ---- compat-wireless-2012-02-05/drivers/net/wireless/libertas/if_cs.c.orig 2012-02-05 16:10:38.000000000 -0500 -+++ compat-wireless-2012-02-05/drivers/net/wireless/libertas/if_cs.c 2012-02-06 11:53:01.631278143 -0500 -@@ -21,6 +21,7 @@ - - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include -diff -up compat-wireless-2012-02-05/drivers/net/wireless/libertas/if_sdio.c.orig compat-wireless-2012-02-05/drivers/net/wireless/libertas/if_sdio.c ---- compat-wireless-2012-02-05/drivers/net/wireless/libertas/if_sdio.c.orig 2012-02-05 16:10:38.000000000 -0500 -+++ compat-wireless-2012-02-05/drivers/net/wireless/libertas/if_sdio.c 2012-02-06 11:53:01.631278143 -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 -diff -up compat-wireless-2012-02-05/drivers/net/wireless/libertas/if_spi.c.orig compat-wireless-2012-02-05/drivers/net/wireless/libertas/if_spi.c ---- compat-wireless-2012-02-05/drivers/net/wireless/libertas/if_spi.c.orig 2012-02-05 16:10:38.000000000 -0500 -+++ compat-wireless-2012-02-05/drivers/net/wireless/libertas/if_spi.c 2012-02-06 11:53:01.631278143 -0500 -@@ -17,6 +17,7 @@ - * (at your option) any later version. - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include -diff -up compat-wireless-2012-02-05/drivers/net/wireless/libertas/if_usb.c.orig compat-wireless-2012-02-05/drivers/net/wireless/libertas/if_usb.c ---- compat-wireless-2012-02-05/drivers/net/wireless/libertas/if_usb.c.orig 2012-02-05 16:10:35.000000000 -0500 -+++ compat-wireless-2012-02-05/drivers/net/wireless/libertas/if_usb.c 2012-02-06 11:53:01.632278130 -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 -diff -up compat-wireless-2012-02-05/drivers/net/wireless/libertas/main.c.orig compat-wireless-2012-02-05/drivers/net/wireless/libertas/main.c ---- compat-wireless-2012-02-05/drivers/net/wireless/libertas/main.c.orig 2012-02-05 16:10:38.000000000 -0500 -+++ compat-wireless-2012-02-05/drivers/net/wireless/libertas/main.c 2012-02-06 11:53:01.632278130 -0500 -@@ -4,6 +4,7 @@ - * thread etc.. - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include -diff -up compat-wireless-2012-02-05/drivers/net/wireless/libertas/mesh.c.orig compat-wireless-2012-02-05/drivers/net/wireless/libertas/mesh.c ---- compat-wireless-2012-02-05/drivers/net/wireless/libertas/mesh.c.orig 2012-02-05 16:10:38.000000000 -0500 -+++ compat-wireless-2012-02-05/drivers/net/wireless/libertas/mesh.c 2012-02-06 11:53:01.633278118 -0500 -@@ -1,3 +1,4 @@ -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include -diff -up compat-wireless-2012-02-05/drivers/net/wireless/libertas/rx.c.orig compat-wireless-2012-02-05/drivers/net/wireless/libertas/rx.c ---- compat-wireless-2012-02-05/drivers/net/wireless/libertas/rx.c.orig 2012-02-05 16:10:35.000000000 -0500 -+++ compat-wireless-2012-02-05/drivers/net/wireless/libertas/rx.c 2012-02-06 11:53:01.633278118 -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 -diff -up compat-wireless-2012-02-05/drivers/net/wireless/libertas_tf/cmd.c.orig compat-wireless-2012-02-05/drivers/net/wireless/libertas_tf/cmd.c ---- compat-wireless-2012-02-05/drivers/net/wireless/libertas_tf/cmd.c.orig 2012-02-05 16:10:36.000000000 -0500 -+++ compat-wireless-2012-02-05/drivers/net/wireless/libertas_tf/cmd.c 2012-02-06 11:53:01.633278118 -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 -diff -up compat-wireless-2012-02-05/drivers/net/wireless/libertas_tf/if_usb.c.orig compat-wireless-2012-02-05/drivers/net/wireless/libertas_tf/if_usb.c ---- compat-wireless-2012-02-05/drivers/net/wireless/libertas_tf/if_usb.c.orig 2012-02-05 16:10:36.000000000 -0500 -+++ compat-wireless-2012-02-05/drivers/net/wireless/libertas_tf/if_usb.c 2012-02-06 11:53:01.634278106 -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-2012-02-05/drivers/net/wireless/libertas_tf/main.c.orig compat-wireless-2012-02-05/drivers/net/wireless/libertas_tf/main.c ---- compat-wireless-2012-02-05/drivers/net/wireless/libertas_tf/main.c.orig 2012-02-05 16:10:38.000000000 -0500 -+++ compat-wireless-2012-02-05/drivers/net/wireless/libertas_tf/main.c 2012-02-06 11:53:01.634278106 -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 -diff -up compat-wireless-2012-02-05/drivers/net/wireless/rtlwifi/base.c.orig compat-wireless-2012-02-05/drivers/net/wireless/rtlwifi/base.c -diff -up compat-wireless-2012-02-05/drivers/net/wireless/rtlwifi/cam.c.orig compat-wireless-2012-02-05/drivers/net/wireless/rtlwifi/cam.c -diff -up compat-wireless-2012-02-05/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c.orig compat-wireless-2012-02-05/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c -diff -up compat-wireless-2012-02-05/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c.orig compat-wireless-2012-02-05/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c -diff -up compat-wireless-2012-02-05/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c.orig compat-wireless-2012-02-05/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c -diff -up compat-wireless-2012-02-05/drivers/net/wireless/rtlwifi/rtl8192de/sw.c.orig compat-wireless-2012-02-05/drivers/net/wireless/rtlwifi/rtl8192de/sw.c -diff -up compat-wireless-2012-02-05/drivers/net/wireless/rtlwifi/rtl8192se/hw.c.orig compat-wireless-2012-02-05/drivers/net/wireless/rtlwifi/rtl8192se/hw.c -diff -up compat-wireless-2012-02-05/drivers/net/wireless/rtlwifi/rtl8192se/phy.c.orig compat-wireless-2012-02-05/drivers/net/wireless/rtlwifi/rtl8192se/phy.c -diff -up compat-wireless-2012-02-05/drivers/net/wireless/rtlwifi/rtl8192se/rf.c.orig compat-wireless-2012-02-05/drivers/net/wireless/rtlwifi/rtl8192se/rf.c -diff -up compat-wireless-2012-02-05/drivers/net/wireless/rtlwifi/rtl8192se/sw.c.orig compat-wireless-2012-02-05/drivers/net/wireless/rtlwifi/rtl8192se/sw.c -diff -up compat-wireless-2012-02-05/drivers/net/wireless/rtlwifi/usb.c.orig compat-wireless-2012-02-05/drivers/net/wireless/rtlwifi/usb.c -diff -up compat-wireless-2012-02-05/drivers/net/wireless/rtlwifi/wifi.h.orig compat-wireless-2012-02-05/drivers/net/wireless/rtlwifi/wifi.h ---- compat-wireless-2012-02-05/drivers/net/wireless/rtlwifi/wifi.h.orig 2012-02-06 11:53:38.798813484 -0500 -+++ compat-wireless-2012-02-05/drivers/net/wireless/rtlwifi/wifi.h 2012-02-06 11:53:47.489704835 -0500 -@@ -30,6 +30,7 @@ - #ifndef __RTL_WIFI_H__ - #define __RTL_WIFI_H__ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include -diff -up compat-wireless-2012-02-05/net/wireless/core.c.orig compat-wireless-2012-02-05/net/wireless/core.c ---- compat-wireless-2012-02-05/net/wireless/core.c.orig 2012-02-05 16:10:38.000000000 -0500 -+++ compat-wireless-2012-02-05/net/wireless/core.c 2012-02-06 11:53:01.640278030 -0500 -@@ -4,6 +4,7 @@ - * Copyright 2006-2010 Johannes Berg - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include -diff -up compat-wireless-2012-02-05/net/wireless/lib80211.c.orig compat-wireless-2012-02-05/net/wireless/lib80211.c ---- compat-wireless-2012-02-05/net/wireless/lib80211.c.orig 2012-02-05 16:10:31.000000000 -0500 -+++ compat-wireless-2012-02-05/net/wireless/lib80211.c 2012-02-06 11:53:01.640278030 -0500 -@@ -13,6 +13,7 @@ - * - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include -diff -up compat-wireless-2012-02-05/net/wireless/lib80211_crypt_tkip.c.orig compat-wireless-2012-02-05/net/wireless/lib80211_crypt_tkip.c ---- compat-wireless-2012-02-05/net/wireless/lib80211_crypt_tkip.c.orig 2012-02-05 16:10:31.000000000 -0500 -+++ compat-wireless-2012-02-05/net/wireless/lib80211_crypt_tkip.c 2012-02-06 11:53:01.641278018 -0500 -@@ -10,6 +10,7 @@ - * more details. - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include -diff -up compat-wireless-2012-02-05/net/wireless/reg.c.orig compat-wireless-2012-02-05/net/wireless/reg.c ---- compat-wireless-2012-02-05/net/wireless/reg.c.orig 2012-02-05 16:10:31.000000000 -0500 -+++ compat-wireless-2012-02-05/net/wireless/reg.c 2012-02-06 11:53:01.641278018 -0500 -@@ -42,6 +42,7 @@ - * - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include -diff -up compat-wireless-2012-02-05/patches/98-pr_fmt.patch.orig compat-wireless-2012-02-05/patches/98-pr_fmt.patch ---- compat-wireless-2012-02-05/patches/98-pr_fmt.patch.orig 2012-02-06 11:53:01.641278018 -0500 -+++ compat-wireless-2012-02-05/patches/98-pr_fmt.patch 2012-02-06 11:53:01.641278018 -0500 -@@ -0,0 +1,346 @@ -+The way the compat-* header files are included causes the default -+pr_fmt definition from 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 -+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 -+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 -+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 -+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 -+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 -+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 -+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 -+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 -+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 -+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 -+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 -+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 -+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 -+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 -+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 -+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 -+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 -+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 -+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 -+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 -+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 -+ */ -+ -++#undef pr_fmt -+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt -+ -+ #include -+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 -+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 -+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 diff --git a/config-backports b/config-backports deleted file mode 100644 index 33a3adcce..000000000 --- a/config-backports +++ /dev/null @@ -1,24 +0,0 @@ -# CONFIG_CFG80211 is not set -# CONFIG_LIB80211 is not set - -# CONFIG_MAC80211 is not set - -# CONFIG_BCMA is not set - -# -# ssb and b44 share infrastructure with b43 -# -# CONFIG_SSB is not set -# CONFIG_B44 is not set - -# -# Prevent b43 and brcmsmac from competing -# -# CONFIG_B43_BCMA is not set - -# -# These have to be turned-on again since compat-wireless does not -# provide them... -# -CONFIG_CRC7=m -CONFIG_AVERAGE=y diff --git a/kernel.spec b/kernel.spec index 37553bc58..d3dfe5329 100644 --- a/kernel.spec +++ b/kernel.spec @@ -160,9 +160,6 @@ Summary: The Linux kernel # build a release kernel on rawhide %define with_release %{?_with_release: 1} %{?!_with_release: 0} -# Include driver backports (e.g. compat-wireless) in the kernel build. -%define with_backports %{?_without_backports: 0} %{?!_without_backports: 1} - # Set debugbuildsenabled to 1 for production (build separate debug kernels) # and 0 for rawhide (all kernels are debug kernels). # See also 'make debug' and 'make release'. @@ -215,20 +212,6 @@ Summary: The Linux kernel # The kernel tarball/base version %define kversion 3.%{base_sublevel} -# The compat-wireless version -%define cwversion 2012-02-05 - -####################################################################### -# If cwversion is less than kversion, make sure with_backports is -# turned-off. -# -# For rawhide, disable with_backports immediately after a rebase... -# -# (Uncomment the '#' and both spaces below to disable with_backports.) -# -%define with_backports 0 -####################################################################### - %define make_target bzImage %define KVERREL %{version}-%{release}.%{_target_cpu} @@ -396,7 +379,6 @@ Summary: The Linux kernel %define make_target image %define kernel_image arch/s390/boot/image %define with_tools 0 -%define with_backports 0 %endif %ifarch sparc64 @@ -429,7 +411,6 @@ Summary: The Linux kernel %define hdrarch arm %define make_target bzImage %define kernel_image arch/arm/boot/zImage -%define with_backports 0 # we build a up kernel on base softfp/hardfp platforms. its used for qemu. %ifnarch armv5tel armv7hl %define with_up 0 @@ -467,7 +448,6 @@ Summary: The Linux kernel %define with_debuginfo 0 %define with_perf 0 %define with_tools 0 -%define with_backports 0 %define _enable_debug_packages 0 %endif @@ -584,7 +564,6 @@ BuildRequires: gnupg %endif Source0: ftp://ftp.kernel.org/pub/linux/kernel/v3.0/linux-%{kversion}.tar.xz -Source1: compat-wireless-%{cwversion}.tar.bz2 %if %{signmodules} Source11: genkey @@ -621,8 +600,6 @@ Source112: config-arm-kirkwood Source113: config-arm-imx Source114: config-arm-highbank -Source200: config-backports - # This file is intentionally left empty in the stock kernel. Its a nicety # added for those wanting to do custom rebuilds with altered config opts. Source1000: config-local @@ -703,7 +680,6 @@ Patch471: floppy-Remove-_hlt-related-functions.patch Patch510: linux-2.6-silence-noise.patch Patch520: quite-apm.patch Patch530: linux-2.6-silence-fbcon-logo.patch -Patch540: modpost-add-option-to-allow-external-modules-to-avoi.patch Patch700: linux-2.6-e1000-ich9-montevina.patch @@ -803,11 +779,6 @@ Patch21400: unhandled-irqs-switch-to-polling.patch Patch22000: weird-root-dentry-name-debug.patch -# compat-wireless patches -Patch50000: compat-wireless-config-fixups.patch -Patch50001: compat-wireless-pr_fmt-warning-avoidance.patch -Patch50002: compat-wireless-integrated-build.patch - %endif BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root @@ -1323,16 +1294,6 @@ make -f %{SOURCE19} config-release # Dynamically generate kernel .config files from config-* files make -f %{SOURCE20} VERSION=%{version} configs -%if %{with_backports} -# Turn-off bits provided by compat-wireless -for i in %{all_arch_configs} -do - mv $i $i.tmp - ./merge.pl %{SOURCE200} $i.tmp > $i - rm $i.tmp -done -%endif - # Merge in any user-provided local config option changes %if %{?all_arch_configs:1}%{!?all_arch_configs:0} for i in %{all_arch_configs} @@ -1436,11 +1397,6 @@ ApplyPatch linux-2.6-silence-noise.patch # Make fbcon not show the penguins with 'quiet' ApplyPatch linux-2.6-silence-fbcon-logo.patch -%if %{with_backports} -# modpost: add option to allow external modules to avoid taint -ApplyPatch modpost-add-option-to-allow-external-modules-to-avoi.patch -%endif - # Changes to upstream defaults. @@ -1580,6 +1536,9 @@ done # end of kernel config %endif +# get rid of unwanted files resulting from patch fuzz +find . \( -name "*.orig" -o -name "*~" \) -exec rm -f {} \; >/dev/null + # remove unnecessary SCM files find . -name .gitignore -exec rm -f {} \; >/dev/null @@ -1609,30 +1568,6 @@ EOF cd .. -%if %{with_backports} - -# Always start fresh -rm -rf compat-wireless-%{cwversion} - -# Extract the compat-wireless bits -%setup -q -n kernel-%{kversion}%{?dist} -T -D -a 1 - -cd compat-wireless-%{cwversion} - -ApplyPatch compat-wireless-config-fixups.patch -ApplyPatch compat-wireless-pr_fmt-warning-avoidance.patch -ApplyPatch compat-wireless-integrated-build.patch - -ApplyPatch rt2x00_fix_MCU_request_failures.patch - -cd .. - -%endif - -# get rid of unwanted files resulting from patch fuzz -find . \( -name "*.orig" -o -name "*~" \) -exec rm -f {} \; >/dev/null - - ### ### build ### @@ -1763,9 +1698,6 @@ BuildKernel() { # dirs for additional modules per module-init-tools, kbuild/modules.txt mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/extra mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/updates -%if %{with_backports} - mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/backports -%endif # first copy everything cp --parents `find -type f -name "Makefile*" -o -name "Kconfig*"` $RPM_BUILD_ROOT/lib/modules/$KernelVer/build cp Module.symvers $RPM_BUILD_ROOT/lib/modules/$KernelVer/build @@ -1906,6 +1838,12 @@ BuildKernel() { rm mod-extra.list mod-extra2.list mod-extra3.list popd + # remove files that will be auto generated by depmod at rpm -i time + for i in alias alias.bin builtin.bin ccwmap dep dep.bin ieee1394map inputmap isapnpmap ofmap pcimap seriomap symbols symbols.bin usbmap + do + rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/modules.$i + done + # Move the devel headers out of the root file system mkdir -p $RPM_BUILD_ROOT/usr/src/kernels mv $RPM_BUILD_ROOT/lib/modules/$KernelVer/build $RPM_BUILD_ROOT/$DevelDir @@ -1918,33 +1856,6 @@ BuildKernel() { # prune junk from kernel-devel find $RPM_BUILD_ROOT/usr/src/kernels -name ".*.cmd" -exec rm -f {} \; - -%if %{with_backports} - - cd ../compat-wireless-%{cwversion}/ - - install -m 644 config.mk \ - $RPM_BUILD_ROOT/boot/config.mk-compat-wireless-%{cwversion}-$KernelVer - - make -s ARCH=$Arch V=1 %{?_smp_mflags} \ - KLIB_BUILD=../linux-%{KVERREL} \ - KMODPATH_ARG="INSTALL_MOD_PATH=$RPM_BUILD_ROOT" \ - KMODDIR="backports" install-modules %{?sparse_mflags} - - # mark modules executable so that strip-to-file can strip them - find $RPM_BUILD_ROOT/lib/modules/$KernelVer/backports -name "*.ko" \ - -type f | xargs --no-run-if-empty chmod u+x - - cd - - -%endif - - # remove files that will be auto generated by depmod at rpm -i time - for i in alias alias.bin builtin.bin ccwmap dep dep.bin ieee1394map inputmap isapnpmap ofmap pcimap seriomap symbols symbols.bin usbmap - do - rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/modules.$i - done - } ### @@ -2387,10 +2298,6 @@ fi /lib/modules/%{KVERREL}%{?2:.%{2}}/build\ /lib/modules/%{KVERREL}%{?2:.%{2}}/source\ /lib/modules/%{KVERREL}%{?2:.%{2}}/updates\ -%if %{with_backports}\ -/boot/config.mk-compat-wireless-%{cwversion}-%{KVERREL}%{?2:.%{2}}\ -/lib/modules/%{KVERREL}%{?2:.%{2}}/backports\ -%endif\ %ifarch %{vdso_arches}\ /lib/modules/%{KVERREL}%{?2:.%{2}}/vdso\ /etc/ld.so.conf.d/kernel-%{KVERREL}%{?2:.%{2}}.conf\ @@ -2437,6 +2344,9 @@ fi # ||----w | # || || %changelog +* Tue Mar 13 2012 John W. Linville +- Remove infrastructure related to compat-wireless integration + * Mon Mar 12 2012 Mark Langsdorf - Re-enable highbank config option and add new config file to support it diff --git a/modpost-add-option-to-allow-external-modules-to-avoi.patch b/modpost-add-option-to-allow-external-modules-to-avoi.patch deleted file mode 100644 index d20385457..000000000 --- a/modpost-add-option-to-allow-external-modules-to-avoi.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 69f63a67165da5e9f08c1132521598701d914573 Mon Sep 17 00:00:00 2001 -From: John W. Linville -Date: Wed, 14 Dec 2011 11:09:04 -0500 -Subject: [PATCH] modpost: add option to allow external modules to avoid taint - -In some cases, it might be desirable to package a module from an -external source tree alongside the base kernel. In those cases, it -might also be desirable to not have those modules tainting the kernel. - -This patch provides a mechanism for an external module build to declare -itself as an "integrated build". Such a module is then treated the same -as an intree module. - -Signed-off-by: John W. Linville ---- -Any thoughts on this? I'm thinking of adding this to Fedora kernels, -where I have been working to integrate the compat-wireless package as -part of the base kernel RPM. - - scripts/Makefile.modpost | 1 + - scripts/mod/modpost.c | 10 ++++++++-- - 2 files changed, 9 insertions(+), 2 deletions(-) - -diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost -index 08dce14..160c6fb 100644 ---- a/scripts/Makefile.modpost -+++ b/scripts/Makefile.modpost -@@ -81,6 +81,7 @@ modpost = scripts/mod/modpost \ - $(if $(KBUILD_EXTMOD),-o $(modulesymfile)) \ - $(if $(CONFIG_DEBUG_SECTION_MISMATCH),,-S) \ - $(if $(KBUILD_EXTMOD)$(KBUILD_MODPOST_WARN),-w) \ -+ $(if $(INTEGRATED_BUILD),-B) \ - $(if $(cross_build),-c) - - quiet_cmd_modpost = MODPOST $(words $(filter-out vmlinux FORCE, $^)) modules -diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c -index 2bd594e..5d077f9 100644 ---- a/scripts/mod/modpost.c -+++ b/scripts/mod/modpost.c -@@ -43,6 +43,9 @@ static int warn_unresolved = 0; - static int sec_mismatch_count = 0; - static int sec_mismatch_verbose = 1; - -+/* Is this a module being built as part of an integrated package? */ -+static int integrated_build = 0; -+ - enum export { - export_plain, export_unused, export_gpl, - export_unused_gpl, export_gpl_future, export_unknown -@@ -1851,7 +1854,7 @@ static void add_header(struct buffer *b, struct module *mod) - - static void add_intree_flag(struct buffer *b, int is_intree) - { -- if (is_intree) -+ if (is_intree || integrated_build) - buf_printf(b, "\nMODULE_INFO(intree, \"Y\");\n"); - } - -@@ -2101,7 +2104,7 @@ int main(int argc, char **argv) - struct ext_sym_list *extsym_iter; - struct ext_sym_list *extsym_start = NULL; - -- while ((opt = getopt(argc, argv, "i:I:e:cmsSo:awM:K:")) != -1) { -+ while ((opt = getopt(argc, argv, "i:I:e:cmsSo:awM:K:B")) != -1) { - switch (opt) { - case 'i': - kernel_read = optarg; -@@ -2139,6 +2142,9 @@ int main(int argc, char **argv) - case 'w': - warn_unresolved = 1; - break; -+ case 'B': -+ integrated_build = 1; -+ break; - default: - exit(1); - } --- -1.7.4.4 - diff --git a/sources b/sources index e946d6b0e..c3dd17d5d 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ 364066fa18767ec0ae5f4e4abcf9dc51 linux-3.2.tar.xz -02c210a8fd24acca8c1ac93f6f1d3913 compat-wireless-2012-02-05.tar.bz2 4364d0789141647508a9eb1fba8ffa6f patch-3.3-rc7.xz