linux: generic: refresh patches for 3.1-rc10

Hopefully the last one and identical to final.

SVN-Revision: 28492

diff --git a/target/linux/generic/patches-3.1/100-overlayfs_v11.patch b/target/linux/generic/patches-3.1/100-overlayfs_v11.patch
index 6045781182a20650d902a97a4320e98ec04f7b9f..4cbc3d2c8c03e09ae355637113cf029c265e92ec 100644 (file)
--- a/target/linux/generic/patches-3.1/100-overlayfs_v11.patch
+++ b/target/linux/generic/patches-3.1/100-overlayfs_v11.patch
@@ -202,7 +202,7 @@
 +a crash or deadlock.
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -4783,6 +4783,13 @@ F:      drivers/scsi/osd/
+@@ -4792,6 +4792,13 @@ F:      drivers/scsi/osd/
  F:    include/scsi/osd_*
  F:    fs/exofs/
  
@@ -3121,7 +3121,7 @@
                               struct pipe_inode_info *opipe,
 --- a/include/linux/fs.h
 +++ b/include/linux/fs.h
-@@ -483,6 +483,12 @@ struct iattr {
+@@ -481,6 +481,12 @@ struct iattr {
   */
  #include <linux/quota.h>
  
@@ -3134,7 +3134,7 @@
  /** 
   * enum positive_aop_returns - aop return codes with specific semantics
   *
-@@ -1463,6 +1469,11 @@ struct super_block {
+@@ -1461,6 +1467,11 @@ struct super_block {
        int cleancache_poolid;
  
        struct shrinker s_shrink;       /* per-sb shrinker handle */
@@ -3146,7 +3146,7 @@
  };
  
  /* superblock cache pruning functions */
-@@ -1620,6 +1631,7 @@ struct inode_operations {
+@@ -1618,6 +1629,7 @@ struct inode_operations {
        void (*truncate_range)(struct inode *, loff_t, loff_t);
        int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start,
                      u64 len);
@@ -3154,7 +3154,7 @@
  } ____cacheline_aligned;
  
  struct seq_file;
-@@ -2024,6 +2036,7 @@ extern long do_sys_open(int dfd, const c
+@@ -2022,6 +2034,7 @@ extern long do_sys_open(int dfd, const c
  extern struct file *filp_open(const char *, int, int);
  extern struct file *file_open_root(struct dentry *, struct vfsmount *,
                                   const char *, int);

diff --git a/target/linux/generic/patches-3.1/300-mips_expose_boot_raw.patch b/target/linux/generic/patches-3.1/300-mips_expose_boot_raw.patch
index a7b2022362dc07c96cd2fda6da406ea4708d7b8e..15dcf8ea6f34832c4b2e0e8a5a385616d35a43a9 100644 (file)
--- a/target/linux/generic/patches-3.1/300-mips_expose_boot_raw.patch
+++ b/target/linux/generic/patches-3.1/300-mips_expose_boot_raw.patch
@@ -8,7 +8,7 @@ Acked-by: Rob Landley <rob@landley.net>
 ---
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -853,9 +853,6 @@ config ARC
+@@ -856,9 +856,6 @@ config ARC
  config ARCH_MAY_HAVE_PC_FDC
        bool
  
@@ -18,7 +18,7 @@ Acked-by: Rob Landley <rob@landley.net>
  config CEVT_BCM1480
        bool
  
-@@ -2303,6 +2300,18 @@ config USE_OF
+@@ -2309,6 +2306,18 @@ config USE_OF
        help
          Include support for flattened device tree machine descriptions.
  

diff --git a/target/linux/generic/patches-3.1/301-mips_image_cmdline_hack.patch b/target/linux/generic/patches-3.1/301-mips_image_cmdline_hack.patch
index 3317e36e6dcd8b612cb0f15f638ba9550d8bef79..a0c8cdcbada259cb7a446c2fb00fe5231891715f 100644 (file)
--- a/target/linux/generic/patches-3.1/301-mips_image_cmdline_hack.patch
+++ b/target/linux/generic/patches-3.1/301-mips_image_cmdline_hack.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -952,6 +952,10 @@ config SYNC_R4K
+@@ -955,6 +955,10 @@ config SYNC_R4K
  config MIPS_MACHINE
        def_bool n
  

diff --git a/target/linux/generic/patches-3.1/304-mips_disable_fpu.patch b/target/linux/generic/patches-3.1/304-mips_disable_fpu.patch
index e1f5441cd6d5dad7d4116ab86d839f8646f81c16..4cd67ad9f8313e26eedbd0bd5c62fefda9d8c2bd 100644 (file)
--- a/target/linux/generic/patches-3.1/304-mips_disable_fpu.patch
+++ b/target/linux/generic/patches-3.1/304-mips_disable_fpu.patch
@@ -8,7 +8,7 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org>
 --
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -937,6 +937,17 @@ config I8259
+@@ -940,6 +940,17 @@ config I8259
  config MIPS_BONITO64
        bool
  

diff --git a/target/linux/generic/patches-3.1/630-packet_socket_type.patch b/target/linux/generic/patches-3.1/630-packet_socket_type.patch
index cdbb787aa53ea12971af8cd2397c775be016509e..e295ce1d1ee659fad30a2c00ff8811f4eaa72c20 100644 (file)
--- a/target/linux/generic/patches-3.1/630-packet_socket_type.patch
+++ b/target/linux/generic/patches-3.1/630-packet_socket_type.patch
@@ -75,7 +75,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
        if (!net_eq(dev_net(dev), sock_net(sk)))
                goto drop;
  
-@@ -994,12 +997,12 @@ static int tpacket_rcv(struct sk_buff *s
+@@ -997,12 +1000,12 @@ static int tpacket_rcv(struct sk_buff *s
        struct timespec ts;
        struct skb_shared_hwtstamps *shhwtstamps = skb_hwtstamps(skb);
  
@@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
        if (!net_eq(dev_net(dev), sock_net(sk)))
                goto drop;
  
-@@ -1826,6 +1829,7 @@ static int packet_create(struct net *net
+@@ -1829,6 +1832,7 @@ static int packet_create(struct net *net
        spin_lock_init(&po->bind_lock);
        mutex_init(&po->pg_vec_lock);
        po->prot_hook.func = packet_rcv;
@@ -99,7 +99,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
  
        if (sock->type == SOCK_PACKET)
                po->prot_hook.func = packet_rcv_spkt;
-@@ -2410,6 +2414,16 @@ packet_setsockopt(struct socket *sock, i
+@@ -2413,6 +2417,16 @@ packet_setsockopt(struct socket *sock, i
  
                return fanout_add(sk, val & 0xffff, val >> 16);
        }
@@ -116,7 +116,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
        default:
                return -ENOPROTOOPT;
        }
-@@ -2467,6 +2481,13 @@ static int packet_getsockopt(struct sock
+@@ -2470,6 +2484,13 @@ static int packet_getsockopt(struct sock
  
                data = &val;
                break;

diff --git a/target/linux/generic/patches-3.1/863-gpiommc.patch b/target/linux/generic/patches-3.1/863-gpiommc.patch
index c3c0301e61b492ad8534150da05cba27c92e8bb9..4016f11f43ac4d535ef8fde196457e0379a42eff 100644 (file)
--- a/target/linux/generic/patches-3.1/863-gpiommc.patch
+++ b/target/linux/generic/patches-3.1/863-gpiommc.patch
@@ -829,7 +829,7 @@
 +be done automatically.
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -2933,6 +2933,11 @@ L:      linuxppc-dev@lists.ozlabs.org
+@@ -2930,6 +2930,11 @@ L:      linuxppc-dev@lists.ozlabs.org
  S:    Odd Fixes
  F:    drivers/tty/hvc/
  

diff --git a/target/linux/generic/patches-3.1/920-unable_to_open_console.patch b/target/linux/generic/patches-3.1/920-unable_to_open_console.patch
index 4c9df52464ec9775af09c958cdfb2288fe88fa0a..12598200002907fb5646cc7eab448a61790c7f98 100644 (file)
--- a/target/linux/generic/patches-3.1/920-unable_to_open_console.patch
+++ b/target/linux/generic/patches-3.1/920-unable_to_open_console.patch
@@ -1,6 +1,6 @@
 --- a/init/main.c
 +++ b/init/main.c
-@@ -809,7 +809,7 @@ static int __init kernel_init(void * unu
+@@ -818,7 +818,7 @@ static int __init kernel_init(void * unu
  
        /* Open the /dev/console on the rootfs, this should never fail */
        if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)

diff --git a/target/linux/generic/patches-3.1/921-use_preinit_as_init.patch b/target/linux/generic/patches-3.1/921-use_preinit_as_init.patch
index f3620cb02643991f415d59efd3de4dc89f123ca0..6e869d90055b6c6429bbd3e7b625a407c27f0092 100644 (file)
--- a/target/linux/generic/patches-3.1/921-use_preinit_as_init.patch
+++ b/target/linux/generic/patches-3.1/921-use_preinit_as_init.patch
@@ -1,6 +1,6 @@
 --- a/init/main.c
 +++ b/init/main.c
-@@ -771,10 +771,7 @@ static noinline int init_post(void)
+@@ -780,10 +780,7 @@ static noinline int init_post(void)
                printk(KERN_WARNING "Failed to execute %s.  Attempting "
                                        "defaults...\n", execute_command);
        }

diff --git a/target/linux/generic/patches-3.1/950-vm_exports.patch b/target/linux/generic/patches-3.1/950-vm_exports.patch
index 7b8e089672f4b1d9f29631520f34dae40af661b2..00bbf9a401685e994cab164df8e65d3df231690c 100644 (file)
--- a/target/linux/generic/patches-3.1/950-vm_exports.patch
+++ b/target/linux/generic/patches-3.1/950-vm_exports.patch
@@ -61,7 +61,7 @@
  {
 --- a/kernel/sched.c
 +++ b/kernel/sched.c
-@@ -4967,6 +4967,7 @@ int can_nice(const struct task_struct *p
+@@ -4953,6 +4953,7 @@ int can_nice(const struct task_struct *p
        return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
                capable(CAP_SYS_NICE));
  }

diff --git a/target/linux/generic/patches-3.1/980-update_arm_machtypes.patch b/target/linux/generic/patches-3.1/980-update_arm_machtypes.patch
index 30ebf411558f151b2659d6c9713010d765657972..50de5a70c1f578b57c902af555b2b91a941c8004 100644 (file)
--- a/target/linux/generic/patches-3.1/980-update_arm_machtypes.patch
+++ b/target/linux/generic/patches-3.1/980-update_arm_machtypes.patch
@@ -1959,7 +1959,7 @@
 +arm11                 MACH_ARM11              ARM11                   1972
  cpuat9260             MACH_CPUAT9260          CPUAT9260               1973
 +cpupxa255             MACH_CPUPXA255          CPUPXA255               1974
- eukrea_cpuimx27               MACH_CPUIMX27           CPUIMX27                1975
+ eukrea_cpuimx27               MACH_EUKREA_CPUIMX27    EUKREA_CPUIMX27         1975
 +cheflux                       MACH_CHEFLUX            CHEFLUX                 1976
 +eb_cpux9k2            MACH_EB_CPUX9K2         EB_CPUX9K2              1977
 +opcotec                       MACH_OPCOTEC            OPCOTEC                 1978
@@ -2790,8 +2790,8 @@
 +snapper9g45           MACH_SNAPPER9G45        SNAPPER9G45             2817
 +tam3517                       MACH_TAM3517            TAM3517                 2818
 +pdc100                        MACH_PDC100             PDC100                  2819
- eukrea_cpuimx25sd     MACH_EUKREA_CPUIMX25    EUKREA_CPUIMX25         2820
- eukrea_cpuimx35sd     MACH_EUKREA_CPUIMX35    EUKREA_CPUIMX35         2821
+ eukrea_cpuimx25sd     MACH_EUKREA_CPUIMX25SD  EUKREA_CPUIMX25SD       2820
+ eukrea_cpuimx35sd     MACH_EUKREA_CPUIMX35SD  EUKREA_CPUIMX35SD       2821
  eukrea_cpuimx51sd     MACH_EUKREA_CPUIMX51SD  EUKREA_CPUIMX51SD       2822
  eukrea_cpuimx51               MACH_EUKREA_CPUIMX51    EUKREA_CPUIMX51         2823
 +p565                  MACH_P565               P565                    2824

diff --git a/target/linux/generic/patches-3.1/992-mpcore_wdt_fix_watchdog_counter_loading.patch b/target/linux/generic/patches-3.1/992-mpcore_wdt_fix_watchdog_counter_loading.patch
index 87c1c02ba992e2854093dba85296290f18453299..17e855028a1389333fc2c69d44c76b56eca680fd 100644 (file)
--- a/target/linux/generic/patches-3.1/992-mpcore_wdt_fix_watchdog_counter_loading.patch
+++ b/target/linux/generic/patches-3.1/992-mpcore_wdt_fix_watchdog_counter_loading.patch
@@ -39,8 +39,8 @@ Signed-off-by: Vitaly Kuzmichev <vkuzmichev@mvista.com>
 --- a/arch/arm/kernel/smp_twd.c
 +++ b/arch/arm/kernel/smp_twd.c
 @@ -142,3 +142,10 @@ void __cpuinit twd_timer_setup(struct cl
- 
-       clockevents_register_device(clk);
+       /* Make sure our local interrupt controller has this enabled */
+       gic_enable_ppi(clk->irq);
  }
 +
 +/* Needed by mpcore_wdt */