2011-11-03 15:15:52 +00:00
|
|
|
--- a/arch/mips/lantiq/irq.c
|
|
|
|
|
+++ b/arch/mips/lantiq/irq.c
|
2011-10-10 15:13:46 +00:00
|
|
|
@@ -9,6 +9,7 @@
|
|
|
|
|
|
|
|
|
|
#include <linux/interrupt.h>
|
|
|
|
|
#include <linux/ioport.h>
|
|
|
|
|
+#include <linux/module.h>
|
|
|
|
|
|
|
|
|
|
#include <asm/bootinfo.h>
|
|
|
|
|
#include <asm/irq_cpu.h>
|
2011-11-03 15:15:52 +00:00
|
|
|
@@ -102,6 +103,7 @@ void ltq_mask_and_ack_irq(struct irq_dat
|
2011-10-10 15:13:46 +00:00
|
|
|
ltq_icu_w32(ltq_icu_r32(ier) & ~(1 << irq_nr), ier);
|
|
|
|
|
ltq_icu_w32((1 << irq_nr), isr);
|
|
|
|
|
}
|
|
|
|
|
+EXPORT_SYMBOL(ltq_mask_and_ack_irq);
|
|
|
|
|
|
|
|
|
|
static void ltq_ack_irq(struct irq_data *d)
|
|
|
|
|
{
|
2011-07-06 17:27:17 +00:00
|
|
|
--- a/arch/mips/mm/cache.c
|
|
|
|
|
+++ b/arch/mips/mm/cache.c
|
|
|
|
|
@@ -52,6 +52,8 @@ void (*_dma_cache_wback)(unsigned long s
|
|
|
|
|
void (*_dma_cache_inv)(unsigned long start, unsigned long size);
|
|
|
|
|
|
|
|
|
|
EXPORT_SYMBOL(_dma_cache_wback_inv);
|
|
|
|
|
+EXPORT_SYMBOL(_dma_cache_wback);
|
|
|
|
|
+EXPORT_SYMBOL(_dma_cache_inv);
|
|
|
|
|
|
|
|
|
|
#endif /* CONFIG_DMA_NONCOHERENT */
|
|
|
|
|
|
|
|
|
|
--- a/net/atm/proc.c
|
|
|
|
|
+++ b/net/atm/proc.c
|
|
|
|
|
@@ -154,7 +154,7 @@ static void *vcc_seq_next(struct seq_fil
|
|
|
|
|
static void pvc_info(struct seq_file *seq, struct atm_vcc *vcc)
|
|
|
|
|
{
|
|
|
|
|
static const char *const class_name[] = {
|
|
|
|
|
- "off", "UBR", "CBR", "VBR", "ABR"};
|
|
|
|
|
+ "off","UBR","CBR","NTR-VBR","ABR","ANY","RT-VBR","UBR+","GFR"};
|
|
|
|
|
static const char *const aal_name[] = {
|
|
|
|
|
"---", "1", "2", "3/4", /* 0- 3 */
|
|
|
|
|
"???", "5", "???", "???", /* 4- 7 */
|
|
|
|
|
--- a/net/atm/common.c
|
|
|
|
|
+++ b/net/atm/common.c
|
|
|
|
|
@@ -62,11 +62,17 @@ static void vcc_remove_socket(struct soc
|
|
|
|
|
write_unlock_irq(&vcc_sklist_lock);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
+struct sk_buff* (*ifx_atm_alloc_tx)(struct atm_vcc *, unsigned int) = NULL;
|
|
|
|
|
+EXPORT_SYMBOL(ifx_atm_alloc_tx);
|
|
|
|
|
+
|
|
|
|
|
static struct sk_buff *alloc_tx(struct atm_vcc *vcc, unsigned int size)
|
|
|
|
|
{
|
|
|
|
|
struct sk_buff *skb;
|
|
|
|
|
struct sock *sk = sk_atm(vcc);
|
|
|
|
|
|
|
|
|
|
+ if (ifx_atm_alloc_tx != NULL)
|
|
|
|
|
+ return ifx_atm_alloc_tx(vcc, size);
|
|
|
|
|
+
|
|
|
|
|
if (sk_wmem_alloc_get(sk) && !atm_may_send(vcc, size)) {
|
|
|
|
|
pr_debug("Sorry: wmem_alloc = %d, size = %d, sndbuf = %d\n",
|
|
|
|
|
sk_wmem_alloc_get(sk), size, sk->sk_sndbuf);
|
