[linuxtv-commits] [hg:v4l-dvb] backport commit e282959ef3ebae0d72ac0b24242c376fa34da585
The patch number 8444 was added via Mauro Carvalho Chehab [EMAIL PROTECTED]
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
--
From: Mauro Carvalho Chehab [EMAIL PROTECTED]
backport commit e282959ef3ebae0d72ac0b24242c376fa34da585
Author: Greg Kroah-Hartman [EMAIL PROTECTED]
Date: Wed May 21 12:52:33 2008 -0700
device create: dvb: convert device_create to device_create_drvdata
device_create() is race-prone, so use the race-free
device_create_drvdata() instead as device_create() is going away.
kernel-sync:
Signed-off-by: Mauro Carvalho Chehab [EMAIL PROTECTED]
---
linux/drivers/media/dvb/dvb-core/dvbdev.c |6 ++
1 file changed, 6 insertions(+)
diff -r 08d83bd597d4 -r 439cdc0fc36a linux/drivers/media/dvb/dvb-core/dvbdev.c
--- a/linux/drivers/media/dvb/dvb-core/dvbdev.c Thu Jul 24 12:35:53 2008 -0300
+++ b/linux/drivers/media/dvb/dvb-core/dvbdev.c Thu Jul 24 12:46:11 2008 -0300
@@ -242,9 +242,15 @@ int dvb_register_device(struct dvb_adapt
mutex_unlock(dvbdev_register_lock);
+#if LINUX_VERSION_CODE KERNEL_VERSION(2, 6, 26)
+ clsdev = device_create_drvdata(dvb_class, adap-device,
+ MKDEV(DVB_MAJOR, nums2minor(adap-num, type,
id)),
+ NULL, dvb%d.%s%d, adap-num, dnames[type], id);
+#else
clsdev = device_create(dvb_class, adap-device,
MKDEV(DVB_MAJOR, nums2minor(adap-num, type,
id)),
dvb%d.%s%d, adap-num, dnames[type], id);
+#endif
if (IS_ERR(clsdev)) {
printk(KERN_ERR %s: failed to create device dvb%d.%s%d
(%ld)\n,
__func__, adap-num, dnames[type], id, PTR_ERR(clsdev));
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/439cdc0fc36a0852f66a34beb2d8d9676db9b896
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] backport commit b9e40857682ecfc5bcd0356a23ff409883ffb982
The patch number 8445 was added via Mauro Carvalho Chehab [EMAIL PROTECTED]
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
--
From: Mauro Carvalho Chehab [EMAIL PROTECTED]
backport commit b9e40857682ecfc5bcd0356a23ff409883ffb982
Author: David S. Miller [EMAIL PROTECTED]
Date: Tue Jul 15 00:15:08 2008 -0700
netdev: Do not use TX lock to protect address lists.
Now that we have a specific lock to protect the network
device unicast and multicast lists, remove extraneous
grabs of the TX lock in cases where the code only needs
address list protection.
Signed-off-by: Mauro Carvalho Chehab [EMAIL PROTECTED]
---
linux/drivers/media/dvb/dvb-core/dvb_net.c |8
1 file changed, 8 insertions(+)
diff -r 439cdc0fc36a -r 978801a35c13 linux/drivers/media/dvb/dvb-core/dvb_net.c
--- a/linux/drivers/media/dvb/dvb-core/dvb_net.cThu Jul 24 12:46:11
2008 -0300
+++ b/linux/drivers/media/dvb/dvb-core/dvb_net.cThu Jul 24 12:53:50
2008 -0300
@@ -1165,7 +1165,11 @@ static void wq_set_multicast_list (struc
#ifdef OLD_XMIT_LOCK /* Kernels equal or lower than 2.6.17 */
spin_lock_bh(dev-xmit_lock);
#else
+#if LINUX_VERSION_CODE = KERNEL_VERSION(2, 6, 26)
netif_tx_lock_bh(dev);
+#else
+ netif_addr_lock_bh(dev);
+#endif
#endif
if (dev-flags IFF_PROMISC) {
@@ -1194,7 +1198,11 @@ static void wq_set_multicast_list (struc
#ifdef OLD_XMIT_LOCK /* Kernels equal or lower than 2.6.17 */
spin_unlock_bh(dev-xmit_lock);
#else
+#if LINUX_VERSION_CODE = KERNEL_VERSION(2, 6, 26)
netif_tx_unlock_bh(dev);
+#else
+ netif_addr_unlock_bh(dev);
+#endif
#endif
dvb_net_feed_start(dev);
}
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/978801a35c13a7b41d1431c72867a37d5f3fb3c5
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] backport commit a81792f668c20540c336af4242ba1400763eb14f
The patch number 8443 was added via Mauro Carvalho Chehab [EMAIL PROTECTED] to http://linuxtv.org/hg/v4l-dvb master development tree. Kernel patches in this development tree may be modified to be backward compatible with older kernels. Compatibility modifications will be removed before inclusion into the mainstream Kernel If anyone has any objections, please let us know by sending a message to: [EMAIL PROTECTED] -- From: Mauro Carvalho Chehab [EMAIL PROTECTED] backport commit a81792f668c20540c336af4242ba1400763eb14f Author: Johannes Berg [EMAIL PROTECTED] Date: Tue Jul 8 19:00:25 2008 +0200 remove mention of CONFIG_KMOD from documentation kernel-sync: Signed-off-by: Mauro Carvalho Chehab [EMAIL PROTECTED] --- linux/Documentation/video4linux/w9968cf.txt |3 --- 1 file changed, 3 deletions(-) diff -r f445674ce0d2 -r 08d83bd597d4 linux/Documentation/video4linux/w9968cf.txt --- a/linux/Documentation/video4linux/w9968cf.txt Tue Jul 22 10:35:10 2008 +0200 +++ b/linux/Documentation/video4linux/w9968cf.txt Thu Jul 24 12:35:53 2008 -0300 @@ -193,9 +193,6 @@ Description: Automatic 'ovcamchip' m loads that module automatically. This action is performed as once soon as the 'w9968cf' module is loaded into memory. Default: 1 -Note:The kernel must be compiled with the CONFIG_KMOD option -enabled for the 'ovcamchip' module to be loaded and for -this parameter to be present. --- Name: simcams Type: int --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/08d83bd597d40c843378386ce36dcbc07db374d0 ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
Re: [linuxtv-commits] [hg:v4l-dvb] make cpia2 and vicam backward compatible
On Thu, 24 Jul 2008 19:37:25 +0200 Hans Verkuil [EMAIL PROTECTED] wrote: On Thursday 24 July 2008 18:35:04 Patch from Mauro Carvalho Chehab wrote: The patch number 8449 was added via Mauro Carvalho Chehab [EMAIL PROTECTED] to http://linuxtv.org/hg/v4l-dvb master development tree. Kernel patches in this development tree may be modified to be backward compatible with older kernels. Compatibility modifications will be removed before inclusion into the mainstream Kernel If anyone has any objections, please let us know by sending a message to: [EMAIL PROTECTED] Kernel build failed due to these constructs introduced by this patch: +#if LINUX_VERSION_CODE = KERNEL_VERSION(2,6,27) Should be = of course. Argh... My script that auto-generates this were broken. Fixed. Next time, we shouldn't have more troubles with this. This happens in linux/drivers/media/video/cpia2/cpia2_core.c, linux/drivers/media/video/dabusb.c and linux/drivers/media/video/usbvideo/vicam.c. Fixed, thanks. Regards, Hans Cheers, Mauro ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
