[Pkg-voip-commits] r7954 - in /zaptel/branches/lenny/debian: changelog patches/headers_2632 patches/headers_extra_drivers_2632 patches/series patches/xpp_drvdata_2632
tzafrir-guest at alioth.debian.org
tzafrir-guest at alioth.debian.org
Mon Jan 11 12:57:48 UTC 2010
Author: tzafrir-guest
Date: Mon Jan 11 12:57:45 2010
New Revision: 7954
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7954
Log:
* Patch xpp_drvdata_2632: Make xpp driver use proper drvdata interface.
Fixes building with kernel 2.6.32 .
* Patch headers_2632: Add extra headers to fix building with 2.6.32 .
* Patch headers_extra_drivers_2632: Ditto, for our extra modules.
Added:
zaptel/branches/lenny/debian/patches/headers_2632
zaptel/branches/lenny/debian/patches/headers_extra_drivers_2632
zaptel/branches/lenny/debian/patches/xpp_drvdata_2632
Modified:
zaptel/branches/lenny/debian/changelog
zaptel/branches/lenny/debian/patches/series
Modified: zaptel/branches/lenny/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/branches/lenny/debian/changelog?rev=7954&op=diff
==============================================================================
--- zaptel/branches/lenny/debian/changelog (original)
+++ zaptel/branches/lenny/debian/changelog Mon Jan 11 12:57:45 2010
@@ -10,8 +10,12 @@
Fix two 2.6.30 build issues (Closes: #537202).
* Disable building wcopenpci on sparc as well (Closes: #544779).
* Patche vzaphfc_net_device_2629: fixes vzaphfc with 2.6.29 (Closes: #522289).
-
- -- Tzafrir Cohen <tzafrir.cohen at xorcom.com> Fri, 11 Sep 2009 19:17:44 +0300
+ * Patch xpp_drvdata_2632: Make xpp driver use proper drvdata interface.
+ Fixes building with kernel 2.6.32 .
+ * Patch headers_2632: Add extra headers to fix building with 2.6.32 .
+ * Patch headers_extra_drivers_2632: Ditto, for our extra modules.
+
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com> Mon, 11 Jan 2010 14:35:50 +0200
zaptel (1:1.4.11~dfsg-3) unstable; urgency=high
Added: zaptel/branches/lenny/debian/patches/headers_2632
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/branches/lenny/debian/patches/headers_2632?rev=7954&op=file
==============================================================================
--- zaptel/branches/lenny/debian/patches/headers_2632 (added)
+++ zaptel/branches/lenny/debian/patches/headers_2632 Mon Jan 11 12:57:45 2010
@@ -1,0 +1,155 @@
+Subject: zaptel-base,xpp,wcte12xp,wctdm24xxp,wctdm,pciradio: Compilation updates.
+From: Shaun Ruffell <sruffell at digium.com>
+Date: Thu, 19 Nov 2009 05:42:20 +0000
+Origin: http://svn.digium.com/svn/zaptel/branches/1.4@4692
+
+Adding some header files to the different drivers in order to enable them to
+compile against 2.6.32.
+
+---
+ kernel/pciradio.c | 1 +
+ kernel/wctdm.c | 2 ++
+ kernel/wctdm24xxp/GpakApi.c | 2 ++
+ kernel/wctdm24xxp/GpakCust.c | 2 ++
+ kernel/wctdm24xxp/base.c | 2 ++
+ kernel/wcte12xp/GpakApi.c | 2 ++
+ kernel/wcte12xp/base.c | 2 ++
+ kernel/xpp/xbus-core.c | 2 ++
+ kernel/xpp/xpp_zap.c | 1 +
+ kernel/zaptel-base.c | 2 ++
+ 10 files changed, 18 insertions(+), 0 deletions(-)
+
+diff --git a/kernel/pciradio.c b/kernel/pciradio.c
+index cee4fc2..1a8376c 100644
+--- a/kernel/pciradio.c
++++ b/kernel/pciradio.c
+@@ -51,6 +51,7 @@ With driver: 303826 (1.5 %)
+ #include <linux/interrupt.h>
+ #include <asm/io.h>
+ #include <asm/delay.h>
++#include <linux/sched.h>
+
+ #ifdef STANDALONE_ZAPATA
+ #include "zaptel.h"
+diff --git a/kernel/wctdm.c b/kernel/wctdm.c
+index 7176c68..9da31ea 100644
+--- a/kernel/wctdm.c
++++ b/kernel/wctdm.c
+@@ -30,9 +30,11 @@
+ #include <linux/errno.h>
+ #include <linux/pci.h>
+ #include <linux/interrupt.h>
++#include <linux/sched.h>
+ #include <asm/io.h>
+ #include "proslic.h"
+ #include "wctdm.h"
++
+ /*
+ * Define for audio vs. register based ring detection
+ *
+diff --git a/kernel/wctdm24xxp/GpakApi.c b/kernel/wctdm24xxp/GpakApi.c
+index 78d0681..de50563 100644
+--- a/kernel/wctdm24xxp/GpakApi.c
++++ b/kernel/wctdm24xxp/GpakApi.c
+@@ -39,6 +39,8 @@
+ #include <asm/semaphore.h>
+ #endif
+
++#include <linux/workqueue.h>
++
+ #include "zaptel.h"
+
+ #include "GpakHpi.h"
+diff --git a/kernel/wctdm24xxp/GpakCust.c b/kernel/wctdm24xxp/GpakCust.c
+index f9af4e8..4c768af 100644
+--- a/kernel/wctdm24xxp/GpakCust.c
++++ b/kernel/wctdm24xxp/GpakCust.c
+@@ -41,6 +41,8 @@
+ #include <asm/semaphore.h>
+ #endif
+
++#include <linux/workqueue.h>
++
+ #include "zaptel.h"
+ #include "wctdm24xxp.h"
+ #include "GpakCust.h"
+diff --git a/kernel/wctdm24xxp/base.c b/kernel/wctdm24xxp/base.c
+index bf8a409..d4213ca 100644
+--- a/kernel/wctdm24xxp/base.c
++++ b/kernel/wctdm24xxp/base.c
+@@ -54,6 +54,8 @@ Tx Gain - W/Pre-Emphasis: -23.99 to 0.00 db
+ #include <linux/moduleparam.h>
+ #endif
+
++#include <linux/sched.h>
++
+ #include "zaptel.h"
+ #include "proslic.h"
+ #include "wctdm.h"
+diff --git a/kernel/wcte12xp/GpakApi.c b/kernel/wcte12xp/GpakApi.c
+index 78c4687..f57239d 100644
+--- a/kernel/wcte12xp/GpakApi.c
++++ b/kernel/wcte12xp/GpakApi.c
+@@ -32,6 +32,8 @@
+ * this program for more details.
+ */
+
++#include <linux/workqueue.h>
++
+ #include "zaptel.h"
+
+ #include "GpakHpi.h"
+diff --git a/kernel/wcte12xp/base.c b/kernel/wcte12xp/base.c
+index e90dda3..2f7dcdc 100644
+--- a/kernel/wcte12xp/base.c
++++ b/kernel/wcte12xp/base.c
+@@ -39,6 +39,8 @@
+ #include <linux/moduleparam.h>
+ #endif
+
++#include <linux/sched.h>
++
+ #include "zaptel.h"
+
+ #include "../wct4xxp/wct4xxp.h" /* For certain definitions */
+diff --git a/kernel/xpp/xbus-core.c b/kernel/xpp/xbus-core.c
+index 89ac287..e328cb9 100644
+--- a/kernel/xpp/xbus-core.c
++++ b/kernel/xpp/xbus-core.c
+@@ -35,6 +35,8 @@
+ #include <linux/workqueue.h>
+ #include <linux/device.h>
+ #include <linux/delay.h> /* for msleep() to debug */
++#include <linux/sched.h>
++
+ #include "xpd.h"
+ #include "xpp_zap.h"
+ #include "xbus-core.h"
+diff --git a/kernel/xpp/xpp_zap.c b/kernel/xpp/xpp_zap.c
+index f99c4fe..65fab74 100644
+--- a/kernel/xpp/xpp_zap.c
++++ b/kernel/xpp/xpp_zap.c
+@@ -31,6 +31,7 @@
+ #endif
+
+ #include <linux/kernel.h>
++#include <linux/sched.h>
+ #include <linux/errno.h>
+ #include <linux/module.h>
+ #include <linux/device.h>
+diff --git a/kernel/zaptel-base.c b/kernel/zaptel-base.c
+index 89346b4..02e0bc2 100644
+--- a/kernel/zaptel-base.c
++++ b/kernel/zaptel-base.c
+@@ -90,6 +90,8 @@
+ #include <asm/i387.h>
+ #endif
+
++#include <linux/sched.h>
++
+ #define hdlc_to_ztchan(h) (((struct zt_hdlc *)(h))->chan)
+ #define dev_to_ztchan(h) (((struct zt_hdlc *)(dev_to_hdlc(h)->priv))->chan)
+ #ifdef LINUX26
+--
+1.5.6.5
+
Added: zaptel/branches/lenny/debian/patches/headers_extra_drivers_2632
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/branches/lenny/debian/patches/headers_extra_drivers_2632?rev=7954&op=file
==============================================================================
--- zaptel/branches/lenny/debian/patches/headers_extra_drivers_2632 (added)
+++ zaptel/branches/lenny/debian/patches/headers_extra_drivers_2632 Mon Jan 11 12:57:45 2010
@@ -1,0 +1,67 @@
+Authors: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+Subject: sched.h was also removed from interrupts.h
+Forworded: no
+Last-Update: 2010-01-11
+
+Apply the same fix from patch header_2632 to all of our extra drivers.
+
+--- a/kernel/opvxa1200.c
++++ b/kernel/opvxa1200.c
+@@ -52,6 +52,7 @@
+ #include <linux/errno.h>
+ #include <linux/pci.h>
+ #include <linux/interrupt.h>
++#include <linux/sched.h>
+ #include <asm/io.h>
+ #include "proslic.h"
+ #include "wctdm.h"
+--- a/kernel/wcopenpci.c
++++ b/kernel/wcopenpci.c
+@@ -46,6 +46,7 @@
+ #include <linux/module.h>
+ #include <linux/pci.h>
+ #include <linux/delay.h>
++#include <linux/sched.h>
+
+ #ifdef STANDALONE_ZAPATA
+ #include "zaptel.h"
+--- a/kernel/zaphfc/zaphfc.c
++++ b/kernel/zaphfc/zaphfc.c
+@@ -27,6 +27,7 @@
+ #include <linux/init.h>
+ #include <linux/interrupt.h>
+ #include <linux/delay.h>
++#include <linux/sched.h>
+ #include <zaptel.h>
+ #include "zaphfc.h"
+
+--- a/kernel/vzaphfc/vzaphfc_main.c
++++ b/kernel/vzaphfc/vzaphfc_main.c
+@@ -31,6 +31,7 @@
+ #include <linux/proc_fs.h>
+ #include <linux/netdevice.h>
+ #include <linux/if_arp.h>
++#include <linux/sched.h>
+
+ #include "vzaphfc.h"
+ #include "fifo.h"
+--- a/kernel/qozap/qozap.c
++++ b/kernel/qozap/qozap.c
+@@ -15,6 +15,7 @@
+ #include <linux/pci.h>
+ #include <linux/init.h>
+ #include <linux/interrupt.h>
++#include <linux/sched.h>
+ #include <zaptel.h>
+ #include "qozap.h"
+
+--- a/kernel/ztgsm/ztgsm.c
++++ b/kernel/ztgsm/ztgsm.c
+@@ -14,6 +14,7 @@
+ #include <linux/pci.h>
+ #include <linux/init.h>
+ #include <linux/interrupt.h>
++#include <linux/sched.h>
+ #include <zaptel.h>
+ #include "ztgsm.h"
+
Modified: zaptel/branches/lenny/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/branches/lenny/debian/patches/series?rev=7954&op=diff
==============================================================================
--- zaptel/branches/lenny/debian/patches/series (original)
+++ zaptel/branches/lenny/debian/patches/series Mon Jan 11 12:57:45 2010
@@ -21,3 +21,6 @@
xpp_procfs_owner_2630
vzaphfc_no_owner_2630
vzaphfc_net_device_2629
+headers_2632
+xpp_drvdata_2632
+headers_extra_drivers_2632
Added: zaptel/branches/lenny/debian/patches/xpp_drvdata_2632
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/branches/lenny/debian/patches/xpp_drvdata_2632?rev=7954&op=file
==============================================================================
--- zaptel/branches/lenny/debian/patches/xpp_drvdata_2632 (added)
+++ zaptel/branches/lenny/debian/patches/xpp_drvdata_2632 Mon Jan 11 12:57:45 2010
@@ -1,0 +1,47 @@
+From: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+Subject: xpp: Use proper get/set for device->driver_data
+Origin: http://svn.digium.com/svn/zaptel/branches/1.4@4687
+Last-Update: 2010-01-11
+
+2.6.32-rc1 broke direct access to the member 'driver_data' of 'struct
+device'. However direct access to wasn't proper in the first place.
+
+This commit replaces direct access to dev->driver_data with
+dev_get_drvdata() and dev_set_drvdata().
+
+This is a backport from https://origsvn.digium.com/svn/dahdi/linux/trunk@7226.
+
+(Manually adjusted to an older version of the xpp driver)
+
+--- a/kernel/xpp/xbus-sysfs.c
++++ b/kernel/xpp/xbus-sysfs.c
+@@ -354,9 +354,9 @@ void xbus_sysfs_remove(xbus_t *xbus)
+ XBUS_DBG(GENERAL, xbus, "\n");
+ astribank = &xbus->astribank;
+ BUG_ON(!astribank);
+- if(!astribank->driver_data)
++ if(!dev_get_drvdata(astribank))
+ return;
+- BUG_ON(astribank->driver_data != xbus);
++ BUG_ON(dev_get_drvdata(astribank) != xbus);
+ #ifdef SAMPLE_TICKS
+ device_remove_file(&xbus->astribank, &dev_attr_samples);
+ #endif
+@@ -381,7 +381,7 @@ int xbus_sysfs_create(xbus_t *xbus)
+ astribank->bus = &xpp_bus_type;
+ astribank->parent = &xpp_bus;
+ dev_set_name(astribank, "xbus-%02d", xbus->num);
+- astribank->driver_data = NULL; /* override below */
++ dev_set_drvdata(astribank, NULL); /* override below */
+ astribank->release = xpp_dev_release;
+ ret = device_register(astribank);
+ if(ret) {
+@@ -420,7 +420,7 @@ int xbus_sysfs_create(xbus_t *xbus)
+ goto out;
+ }
+ #endif
+- astribank->driver_data = xbus; /* Everything is good */
++ dev_set_drvdata(astribank, xbus); /* Everything is good */
+ out:
+ return ret;
+ }
More information about the Pkg-voip-commits
mailing list