packages: dahdi-linux/dahdi-linux.spec, dahdi-linux/dahdi-linux-kernel-3.4....

[baggins]

Author: baggins                      Date: Sun Jul  1 12:59:18 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- asm/system.h is gone in linux 3.4

---- Files affected:
packages/dahdi-linux:
   dahdi-linux.spec (1.126 -> 1.127) , dahdi-linux-kernel-3.4.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/dahdi-linux/dahdi-linux.spec
diff -u packages/dahdi-linux/dahdi-linux.spec:1.126 packages/dahdi-linux/dahdi-linux.spec:1.127
--- packages/dahdi-linux/dahdi-linux.spec:1.126	Sat Jun 23 21:49:22 2012
+++ packages/dahdi-linux/dahdi-linux.spec	Sun Jul  1 14:59:13 2012
@@ -58,6 +58,7 @@
 Patch0:		%{pname}-build.patch
 # http://oss.axsentis.de/people/stkn/openzap/dahdi-2.4.0-linux-2.6.37.patch
 Patch1:		dahdi-2.4.0-linux-2.6.37.patch
+Patch2:		dahdi-linux-kernel-3.4.patch
 URL:		http://www.asterisk.org/
 %if %{with dist_kernel}
 BuildRequires:	kernel%{_alt_kernel}-module-build
@@ -136,6 +137,7 @@
 %setup -q -n %{pname}-%{version}
 %patch0 -p1
 #%patch1 -p1
+%patch2 -p1
 
 for a in %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7}; do
 	ln -s $a drivers/dahdi/firmware
@@ -223,6 +225,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.127  2012/07/01 12:59:13  baggins
+- asm/system.h is gone in linux 3.4
+
 Revision 1.126  2012/06/23 19:49:22  arekm
 - rebuild for kernel-3.4.4-1
 - release 25 (by relup.sh)

================================================================
Index: packages/dahdi-linux/dahdi-linux-kernel-3.4.patch
diff -u /dev/null packages/dahdi-linux/dahdi-linux-kernel-3.4.patch:1.1
--- /dev/null	Sun Jul  1 14:59:18 2012
+++ packages/dahdi-linux/dahdi-linux-kernel-3.4.patch	Sun Jul  1 14:59:13 2012
@@ -0,0 +1,23 @@
+--- dahdi-linux-2.6.0/drivers/dahdi/wcb4xxp/base.c.orig	2012-07-01 14:54:16.403757879 +0200
++++ dahdi-linux-2.6.0/drivers/dahdi/wcb4xxp/base.c	2012-07-01 14:57:24.020417929 +0200
+@@ -22,6 +22,7 @@
+ 
+ #include <linux/init.h>
+ 
++#include <linux/version.h>
+ #include <linux/kernel.h>	/* printk() */
+ #include <linux/errno.h>	/* error codes */
+ #include <linux/module.h>
+@@ -35,7 +36,11 @@
+ #include <linux/spinlock.h>
+ #include <linux/device.h>	/* dev_err() */
+ #include <linux/interrupt.h>
+-#include <asm/system.h>		/* cli(), *_flags */
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0)
++#include <asm/system.h>		/* *mb(), barrier() */
++#else
++#include <asm/barrier.h>	/* *mb(), barrier() */
++#endif
+ #include <asm/uaccess.h>	/* copy_*_user */
+ #include <linux/workqueue.h>	/* work_struct */
+ #include <linux/timer.h>	/* timer_struct */
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/dahdi-linux/dahdi-linux.spec?r1=1.126&r2=1.127