| 1 | Index: linux-3.0.3/arch/mips/lantiq/irq.c |
| 2 | =================================================================== |
| 3 | --- linux-3.0.3.orig/arch/mips/lantiq/irq.c 2011-09-29 20:43:07.000000000 +0200 |
| 4 | +++ linux-3.0.3/arch/mips/lantiq/irq.c 2011-09-29 20:45:14.785132132 +0200 |
| 5 | @@ -9,6 +9,7 @@ |
| 6 | |
| 7 | #include <linux/interrupt.h> |
| 8 | #include <linux/ioport.h> |
| 9 | +#include <linux/module.h> |
| 10 | |
| 11 | #include <asm/bootinfo.h> |
| 12 | #include <asm/irq_cpu.h> |
| 13 | @@ -102,6 +103,7 @@ |
| 14 | ltq_icu_w32(ltq_icu_r32(ier) & ~(1 << irq_nr), ier); |
| 15 | ltq_icu_w32((1 << irq_nr), isr); |
| 16 | } |
| 17 | +EXPORT_SYMBOL(ltq_mask_and_ack_irq); |
| 18 | |
| 19 | static void ltq_ack_irq(struct irq_data *d) |
| 20 | { |
| 21 | --- a/arch/mips/mm/cache.c |
| 22 | +++ b/arch/mips/mm/cache.c |
| 23 | @@ -52,6 +52,8 @@ void (*_dma_cache_wback)(unsigned long s |
| 24 | void (*_dma_cache_inv)(unsigned long start, unsigned long size); |
| 25 | |
| 26 | EXPORT_SYMBOL(_dma_cache_wback_inv); |
| 27 | +EXPORT_SYMBOL(_dma_cache_wback); |
| 28 | +EXPORT_SYMBOL(_dma_cache_inv); |
| 29 | |
| 30 | #endif /* CONFIG_DMA_NONCOHERENT */ |
| 31 | |
| 32 | --- a/net/atm/proc.c |
| 33 | +++ b/net/atm/proc.c |
| 34 | @@ -154,7 +154,7 @@ static void *vcc_seq_next(struct seq_fil |
| 35 | static void pvc_info(struct seq_file *seq, struct atm_vcc *vcc) |
| 36 | { |
| 37 | static const char *const class_name[] = { |
| 38 | - "off", "UBR", "CBR", "VBR", "ABR"}; |
| 39 | + "off","UBR","CBR","NTR-VBR","ABR","ANY","RT-VBR","UBR+","GFR"}; |
| 40 | static const char *const aal_name[] = { |
| 41 | "---", "1", "2", "3/4", /* 0- 3 */ |
| 42 | "???", "5", "???", "???", /* 4- 7 */ |
| 43 | --- a/net/atm/common.c |
| 44 | +++ b/net/atm/common.c |
| 45 | @@ -62,11 +62,17 @@ static void vcc_remove_socket(struct soc |
| 46 | write_unlock_irq(&vcc_sklist_lock); |
| 47 | } |
| 48 | |
| 49 | +struct sk_buff* (*ifx_atm_alloc_tx)(struct atm_vcc *, unsigned int) = NULL; |
| 50 | +EXPORT_SYMBOL(ifx_atm_alloc_tx); |
| 51 | + |
| 52 | static struct sk_buff *alloc_tx(struct atm_vcc *vcc, unsigned int size) |
| 53 | { |
| 54 | struct sk_buff *skb; |
| 55 | struct sock *sk = sk_atm(vcc); |
| 56 | |
| 57 | + if (ifx_atm_alloc_tx != NULL) |
| 58 | + return ifx_atm_alloc_tx(vcc, size); |
| 59 | + |
| 60 | if (sk_wmem_alloc_get(sk) && !atm_may_send(vcc, size)) { |
| 61 | pr_debug("Sorry: wmem_alloc = %d, size = %d, sndbuf = %d\n", |
| 62 | sk_wmem_alloc_get(sk), size, sk->sk_sndbuf); |
| 63 | |
