* [PATCH 1/2] backports: add replace_fops()
@ 2013-11-13 16:08 Hauke Mehrtens
2013-11-13 16:08 ` [PATCH 2/2] backports: refresh on next-20131113 Hauke Mehrtens
0 siblings, 1 reply; 2+ messages in thread
From: Hauke Mehrtens @ 2013-11-13 16:08 UTC (permalink / raw)
To: mcgrof; +Cc: backports, Hauke Mehrtens
This is needed by drivers/media/dvb-core/dvbdev.c and was added in:
commit e84f9e57b90ca89664d733a7cef19aa7ccd832f3
Author: Al Viro <viro@zeniv.linux.org.uk>
Date: Sun Sep 22 14:17:15 2013 -0400
consolidate the reassignments of ->f_op in ->open() instances
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
backport/backport-include/linux/fs.h | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/backport/backport-include/linux/fs.h b/backport/backport-include/linux/fs.h
index 9de5109..9874f81 100644
--- a/backport/backport-include/linux/fs.h
+++ b/backport/backport-include/linux/fs.h
@@ -38,4 +38,18 @@ extern ssize_t simple_write_to_buffer(void *to, size_t available, loff_t *ppos,
const void __user *from, size_t count);
#endif
+#ifndef replace_fops
+/*
+ * This one is to be used *ONLY* from ->open() instances.
+ * fops must be non-NULL, pinned down *and* module dependencies
+ * should be sufficient to pin the caller down as well.
+ */
+#define replace_fops(f, fops) \
+ do { \
+ struct file *__file = (f); \
+ fops_put(__file->f_op); \
+ BUG_ON(!(__file->f_op = (fops))); \
+ } while(0)
+#endif /* replace_fops */
+
#endif /* _COMPAT_LINUX_FS_H */
--
1.7.10.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH 2/2] backports: refresh on next-20131113
2013-11-13 16:08 [PATCH 1/2] backports: add replace_fops() Hauke Mehrtens
@ 2013-11-13 16:08 ` Hauke Mehrtens
0 siblings, 0 replies; 2+ messages in thread
From: Hauke Mehrtens @ 2013-11-13 16:08 UTC (permalink / raw)
To: mcgrof; +Cc: backports, Hauke Mehrtens
== ckmake-report.log ==
1 2.6.25 [ OK ]
2 2.6.26 [ OK ]
3 2.6.27 [ OK ]
4 2.6.28 [ OK ]
5 2.6.29 [ OK ]
6 2.6.30 [ OK ]
7 2.6.31 [ OK ]
8 2.6.32 [ OK ]
9 2.6.33 [ OK ]
10 2.6.34 [ OK ]
11 2.6.35 [ OK ]
12 2.6.36 [ OK ]
13 2.6.37 [ OK ]
14 2.6.38 [ OK ]
15 2.6.39 [ OK ]
16 3.0.101 [ OK ]
17 3.1.10 [ OK ]
18 3.10.17 [ OK ]
19 3.11.6 [ OK ]
20 3.12-rc7 [ OK ]
21 3.2.52 [ OK ]
22 3.3.8 [ OK ]
23 3.4.67 [ OK ]
24 3.5.7 [ OK ]
25 3.6.11 [ OK ]
26 3.7.10 [ OK ]
27 3.8.13 [ OK ]
28 3.9.11 [ OK ]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
| 2 +-
.../network/11-dev-pm-ops/drivers_net_wireless_ath_ath9k_pci.patch | 4 ++--
.../network/24-pcmcia/drivers_net_wireless_libertas_if_cs.patch | 2 +-
.../network/62-usb_driver_lpm/drivers_bluetooth_ath3k.patch | 2 +-
.../network/62-usb_driver_lpm/drivers_bluetooth_btusb.patch | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
--git a/patches/collateral-evolutions/network/06-header-changes/drivers_net_wireless_rtlwifi_base.patch b/patches/collateral-evolutions/network/06-header-changes/drivers_net_wireless_rtlwifi_base.patch
index ea33c7d..d968ccb 100644
--- a/patches/collateral-evolutions/network/06-header-changes/drivers_net_wireless_rtlwifi_base.patch
+++ b/patches/collateral-evolutions/network/06-header-changes/drivers_net_wireless_rtlwifi_base.patch
@@ -6,5 +6,5 @@
#include <linux/ip.h>
+#include <linux/in.h>
#include <linux/module.h>
+ #include <linux/udp.h>
- /*
diff --git a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_ath_ath9k_pci.patch b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_ath_ath9k_pci.patch
index 5cf7fe8..4356f2e 100644
--- a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_ath_ath9k_pci.patch
+++ b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_ath_ath9k_pci.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/ath/ath9k/pci.c
+++ b/drivers/net/wireless/ath/ath9k/pci.c
-@@ -751,6 +751,9 @@ static int ath_pci_resume(struct device
+@@ -838,6 +838,9 @@ static int ath_pci_resume(struct device
return 0;
}
@@ -10,7 +10,7 @@
static SIMPLE_DEV_PM_OPS(ath9k_pm_ops, ath_pci_suspend, ath_pci_resume);
#define ATH9K_PM_OPS (&ath9k_pm_ops)
-@@ -769,7 +772,12 @@ static struct pci_driver ath_pci_driver
+@@ -856,7 +859,12 @@ static struct pci_driver ath_pci_driver
.id_table = ath_pci_id_table,
.probe = ath_pci_probe,
.remove = ath_pci_remove,
diff --git a/patches/collateral-evolutions/network/24-pcmcia/drivers_net_wireless_libertas_if_cs.patch b/patches/collateral-evolutions/network/24-pcmcia/drivers_net_wireless_libertas_if_cs.patch
index 79f18d6..4b01d60 100644
--- a/patches/collateral-evolutions/network/24-pcmcia/drivers_net_wireless_libertas_if_cs.patch
+++ b/patches/collateral-evolutions/network/24-pcmcia/drivers_net_wireless_libertas_if_cs.patch
@@ -147,7 +147,7 @@
/*
* Most of the libertas cards can do unaligned register access, but some
-@@ -997,7 +1072,13 @@ MODULE_DEVICE_TABLE(pcmcia, if_cs_ids);
+@@ -998,7 +1073,13 @@ MODULE_DEVICE_TABLE(pcmcia, if_cs_ids);
static struct pcmcia_driver lbs_driver = {
.owner = THIS_MODULE,
diff --git a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_ath3k.patch b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_ath3k.patch
index 3b7ee0e..cbe44c2 100644
--- a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_ath3k.patch
+++ b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_ath3k.patch
@@ -1,6 +1,6 @@
--- a/drivers/bluetooth/ath3k.c
+++ b/drivers/bluetooth/ath3k.c
-@@ -505,7 +505,9 @@ static struct usb_driver ath3k_driver =
+@@ -507,7 +507,9 @@ static struct usb_driver ath3k_driver =
.probe = ath3k_probe,
.disconnect = ath3k_disconnect,
.id_table = ath3k_table,
diff --git a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_btusb.patch b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_btusb.patch
index c2928b3..9cc0340 100644
--- a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_btusb.patch
+++ b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_btusb.patch
@@ -1,6 +1,6 @@
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
-@@ -1633,7 +1633,9 @@ static struct usb_driver btusb_driver =
+@@ -1634,7 +1634,9 @@ static struct usb_driver btusb_driver =
#endif
.id_table = btusb_table,
.supports_autosuspend = 1,
--
1.7.10.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-11-13 16:08 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-11-13 16:08 [PATCH 1/2] backports: add replace_fops() Hauke Mehrtens
2013-11-13 16:08 ` [PATCH 2/2] backports: refresh on next-20131113 Hauke Mehrtens
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.