kernel: update linux 3.8 to 3.8.3

[openwrt/svn-archive/archive.git] / target / linux / lantiq / patches-3.8 / 0040-owrt-lantiq-add-atm-hack.patch

diff --git a/target/linux/lantiq/patches-3.8/0040-owrt-lantiq-add-atm-hack.patch b/target/linux/lantiq/patches-3.8/0040-owrt-lantiq-add-atm-hack.patch
index b2e4ab0330dddfa1af2d9e797462a8e3beaf70c6..a72519909873c5e4e2ee4c4e8a8e5aa0077ce2c3 100644 (file)
--- a/target/linux/lantiq/patches-3.8/0040-owrt-lantiq-add-atm-hack.patch
+++ b/target/linux/lantiq/patches-3.8/0040-owrt-lantiq-add-atm-hack.patch
@@ -15,9 +15,6 @@ Subject: [PATCH 40/40] owrt: lantiq: add atm hack
  create mode 100644 arch/mips/include/asm/mach-lantiq/lantiq_atm.h
  create mode 100644 arch/mips/include/asm/mach-lantiq/lantiq_ptm.h
 
-diff --git a/arch/mips/include/asm/mach-lantiq/lantiq_atm.h b/arch/mips/include/asm/mach-lantiq/lantiq_atm.h
-new file mode 100644
-index 0000000..bf045a9
 --- /dev/null
 +++ b/arch/mips/include/asm/mach-lantiq/lantiq_atm.h
 @@ -0,0 +1,196 @@
@@ -217,9 +214,6 @@ index 0000000..bf045a9
 +
 +#endif  //  IFX_ATM_H
 +
-diff --git a/arch/mips/include/asm/mach-lantiq/lantiq_ptm.h b/arch/mips/include/asm/mach-lantiq/lantiq_ptm.h
-new file mode 100644
-index 0000000..698e5c3
 --- /dev/null
 +++ b/arch/mips/include/asm/mach-lantiq/lantiq_ptm.h
 @@ -0,0 +1,203 @@
@@ -426,8 +420,6 @@ index 0000000..698e5c3
 +
 +#endif  //  IFX_PTM_H
 +
-diff --git a/arch/mips/lantiq/irq.c b/arch/mips/lantiq/irq.c
-index 5119487..6d2c486 100644
 --- a/arch/mips/lantiq/irq.c
 +++ b/arch/mips/lantiq/irq.c
 @@ -14,6 +14,7 @@
@@ -438,7 +430,7 @@ index 5119487..6d2c486 100644
  
  #include <asm/bootinfo.h>
  #include <asm/irq_cpu.h>
-@@ -99,6 +100,7 @@ void ltq_mask_and_ack_irq(struct irq_data *d)
+@@ -99,6 +100,7 @@ void ltq_mask_and_ack_irq(struct irq_dat
        ltq_icu_w32(im, ltq_icu_r32(im, ier) & ~BIT(offset), ier);
        ltq_icu_w32(im, BIT(offset), isr);
  }
@@ -446,11 +438,9 @@ index 5119487..6d2c486 100644
  
  static void ltq_ack_irq(struct irq_data *d)
  {
-diff --git a/arch/mips/mm/cache.c b/arch/mips/mm/cache.c
-index 07cec44..a3e3872 100644
 --- a/arch/mips/mm/cache.c
 +++ b/arch/mips/mm/cache.c
-@@ -57,6 +57,8 @@ void (*_dma_cache_wback)(unsigned long start, unsigned long size);
+@@ -58,6 +58,8 @@ void (*_dma_cache_wback)(unsigned long s
  void (*_dma_cache_inv)(unsigned long start, unsigned long size);
  
  EXPORT_SYMBOL(_dma_cache_wback_inv);
@@ -459,8 +449,6 @@ index 07cec44..a3e3872 100644
  
  #endif /* CONFIG_DMA_NONCOHERENT */
  
-diff --git a/include/uapi/linux/atm.h b/include/uapi/linux/atm.h
-index 88399db..78c8bbc 100644
 --- a/include/uapi/linux/atm.h
 +++ b/include/uapi/linux/atm.h
 @@ -130,8 +130,14 @@
@@ -478,11 +466,9 @@ index 88399db..78c8bbc 100644
  struct atm_trafprm {
        unsigned char   traffic_class;  /* traffic class (ATM_UBR, ...) */
        int             max_pcr;        /* maximum PCR in cells per second */
-diff --git a/net/atm/common.c b/net/atm/common.c
-index 806fc0a..82bc78e 100644
 --- a/net/atm/common.c
 +++ b/net/atm/common.c
-@@ -62,11 +62,17 @@ static void vcc_remove_socket(struct sock *sk)
+@@ -62,11 +62,17 @@ static void vcc_remove_socket(struct soc
        write_unlock_irq(&vcc_sklist_lock);
  }
  
@@ -500,11 +486,9 @@ index 806fc0a..82bc78e 100644
        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);
-diff --git a/net/atm/proc.c b/net/atm/proc.c
-index 0d020de..9fdb539 100644
 --- a/net/atm/proc.c
 +++ b/net/atm/proc.c
-@@ -154,7 +154,7 @@ static void *vcc_seq_next(struct seq_file *seq, void *v, loff_t *pos)
+@@ -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[] = {
@@ -513,6 +497,3 @@ index 0d020de..9fdb539 100644
        static const char *const aal_name[] = {
                "---",  "1",    "2",    "3/4",  /*  0- 3 */
                "???",  "5",    "???",  "???",  /*  4- 7 */
--- 
-1.7.10.4
-