]> git.pld-linux.org Git - packages/dahdi-linux.git/blob - linux-3.18.patch
- fix building with linux 3.18
[packages/dahdi-linux.git] / linux-3.18.patch
1 --- dahdi-linux-2.10.0.1/drivers/dahdi/wcte43x-base.c~  2014-09-22 20:40:19.000000000 +0200
2 +++ dahdi-linux-2.10.0.1/drivers/dahdi/wcte43x-base.c   2015-01-26 00:29:29.559216394 +0100
3 @@ -3581,7 +3581,11 @@
4                 return;
5  
6         wc->not_ready = 1;
7 +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0)
8         smp_mb__after_clear_bit();
9 +#else
10 +       smp_mb__after_atomic();
11 +#endif
12  
13         /* Stop everything */
14         wcxb_stop(&wc->xb);
15 --- dahdi-linux-2.10.0.1/drivers/dahdi/wcaxx-base.c~    2014-09-22 20:40:19.000000000 +0200
16 +++ dahdi-linux-2.10.0.1/drivers/dahdi/wcaxx-base.c     2015-01-26 00:30:14.289214817 +0100
17 @@ -3823,7 +3823,11 @@
18         unsigned long flags;
19  
20         clear_bit(INITIALIZED, &wc->bit_flags);
21 -       smp_mb__after_clear_bit();
22 +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0)
23 +       smp_mb__after_clear_bit();
24 +#else
25 +       smp_mb__after_atomic();
26 +#endif
27  
28         /* Make sure we're not on the card list anymore. */
29         mutex_lock(&card_list_lock);
30 --- dahdi-linux-2.10.0.1/drivers/dahdi/wcte12xp/base.c~ 2014-09-22 20:40:19.000000000 +0200
31 +++ dahdi-linux-2.10.0.1/drivers/dahdi/wcte12xp/base.c  2015-01-26 00:30:47.229213654 +0100
32 @@ -2110,7 +2110,11 @@
33          * them. */
34         clear_bit(INITIALIZED, &wc->bit_flags);
35         synchronize_irq(wc->vb.pdev->irq);
36 -       smp_mb__after_clear_bit();
37 +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0)
38 +       smp_mb__after_clear_bit();
39 +#else
40 +       smp_mb__after_atomic();
41 +#endif
42         del_timer_sync(&wc->timer);
43         flush_workqueue(wc->wq);
44  
45 @@ -3076,7 +3080,11 @@
46         remove_sysfs_files(wc);
47  
48         clear_bit(INITIALIZED, &wc->bit_flags);
49 -       smp_mb__after_clear_bit();
50 +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0)
51 +       smp_mb__after_clear_bit();
52 +#else
53 +       smp_mb__after_atomic();
54 +#endif
55  
56         del_timer_sync(&wc->timer);
57         flush_workqueue(wc->wq);
58 --- dahdi-linux-2.10.0.1/drivers/dahdi/wcte13xp-base.c~ 2014-09-22 20:40:19.000000000 +0200
59 +++ dahdi-linux-2.10.0.1/drivers/dahdi/wcte13xp-base.c  2015-01-26 00:31:17.379212592 +0100
60 @@ -1849,7 +1849,11 @@
61         clear_bit(INITIALIZED, &wc->bit_flags);
62         disable_irq(wc->xb.pdev->irq);
63  
64 -       smp_mb__after_clear_bit();
65 +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0)
66 +       smp_mb__after_clear_bit();
67 +#else
68 +       smp_mb__after_atomic();
69 +#endif
70         del_timer_sync(&wc->timer);
71         flush_workqueue(wc->wq);
72  
73 @@ -2725,7 +2729,11 @@
74                 return;
75  
76         clear_bit(INITIALIZED, &wc->bit_flags);
77 -       smp_mb__after_clear_bit();
78 +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0)
79 +       smp_mb__after_clear_bit();
80 +#else
81 +       smp_mb__after_atomic();
82 +#endif
83  
84         /* Quiesce DMA engine interrupts */
85         wcxb_stop(&wc->xb);
This page took 0.096208 seconds and 3 git commands to generate.