KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

linux: generic: refresh patches for 3.1-rc10

Browse source 
Hopefully the last one and identical to final.

SVN-Revision: 28492
This commit is contained in:
Jonas Gorski 2011-10-20 10:32:44 +00:00
parent 90673a048c
commit 40d088446f
11 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
target/linux/generic/patches-3.1/100-overlayfs_v11.patch
View file

@ -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);

4
target/linux/generic/patches-3.1/300-mips_expose_boot_raw.patch
View file

@ -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.

2
target/linux/generic/patches-3.1/301-mips_image_cmdline_hack.patch
View file

@ -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

2
target/linux/generic/patches-3.1/304-mips_disable_fpu.patch
View file

@ -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

8
target/linux/generic/patches-3.1/630-packet_socket_type.patch
View file

@ -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;

2
target/linux/generic/patches-3.1/863-gpiommc.patch
View file

@ -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/

2
target/linux/generic/patches-3.1/920-unable_to_open_console.patch
View file

@ -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)

2
target/linux/generic/patches-3.1/921-use_preinit_as_init.patch
View file

@ -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);
}

2
target/linux/generic/patches-3.1/950-vm_exports.patch
View file

@ -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));
}

6
target/linux/generic/patches-3.1/980-update_arm_machtypes.patch
View file

@ -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

4
target/linux/generic/patches-3.1/992-mpcore_wdt_fix_watchdog_counter_loading.patch
View file

@ -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 */