diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2011-11-13 10:48:05 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2011-11-13 10:48:05 +0000 |
| commit | e30803b3df8914dbd3864d0ba3dfc1e02dfa8524 (patch) | |
| tree | aa5d6eb24cbb7886936f09c1f3d28f7979c05ea4 /target/linux/generic | |
| parent | b94c5c50310b7e0fa870a52cc9ade8a3220adf59 (diff) | |
| download | upstream-e30803b3df8914dbd3864d0ba3dfc1e02dfa8524.tar.gz upstream-e30803b3df8914dbd3864d0ba3dfc1e02dfa8524.tar.bz2 upstream-e30803b3df8914dbd3864d0ba3dfc1e02dfa8524.zip | |
linux: update 3.1 to 3.1.1
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29007 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic')
4 files changed, 6 insertions, 6 deletions
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 4cbc3d2c8c..9870000d3b 100644 --- a/target/linux/generic/patches-3.1/100-overlayfs_v11.patch +++ b/target/linux/generic/patches-3.1/100-overlayfs_v11.patch @@ -254,7 +254,7 @@ rc = PTR_ERR(inode); --- a/fs/namespace.c +++ b/fs/namespace.c -@@ -1494,6 +1494,23 @@ void drop_collected_mounts(struct vfsmou +@@ -1495,6 +1495,23 @@ void drop_collected_mounts(struct vfsmou release_mounts(&umount_list); } diff --git a/target/linux/generic/patches-3.1/102-ehci_hcd_ignore_oc.patch b/target/linux/generic/patches-3.1/102-ehci_hcd_ignore_oc.patch index ea39ac367e..d23a015091 100644 --- a/target/linux/generic/patches-3.1/102-ehci_hcd_ignore_oc.patch +++ b/target/linux/generic/patches-3.1/102-ehci_hcd_ignore_oc.patch @@ -31,10 +31,10 @@ /* --- a/drivers/usb/host/ehci.h +++ b/drivers/usb/host/ehci.h -@@ -139,6 +139,7 @@ struct ehci_hcd { /* one per controlle - unsigned fs_i_thresh:1; /* Intel iso scheduling */ +@@ -140,6 +140,7 @@ struct ehci_hcd { /* one per controlle unsigned use_dummy_qh:1; /* AMD Frame List table quirk*/ unsigned has_synopsys_hc_bug:1; /* Synopsys HC */ + unsigned frame_index_bug:1; /* MosChip (AKA NetMos) */ + unsigned ignore_oc:1; /* required for usb32 quirk */ diff --git a/target/linux/generic/patches-3.1/400-rootfs_split.patch b/target/linux/generic/patches-3.1/400-rootfs_split.patch index ccbe83ea3c..9eb05c4af6 100644 --- a/target/linux/generic/patches-3.1/400-rootfs_split.patch +++ b/target/linux/generic/patches-3.1/400-rootfs_split.patch @@ -257,7 +257,7 @@ --- a/drivers/mtd/mtdchar.c +++ b/drivers/mtd/mtdchar.c -@@ -948,6 +948,12 @@ static int mtd_ioctl(struct file *file, +@@ -949,6 +949,12 @@ static int mtd_ioctl(struct file *file, break; } 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 00bbf9a401..59bfbde2f9 100644 --- a/target/linux/generic/patches-3.1/950-vm_exports.patch +++ b/target/linux/generic/patches-3.1/950-vm_exports.patch @@ -97,7 +97,7 @@ int map_vm_area(struct vm_struct *area, pgprot_t prot, struct page ***pages) { -@@ -1347,6 +1348,7 @@ struct vm_struct *get_vm_area(unsigned l +@@ -1369,6 +1370,7 @@ struct vm_struct *get_vm_area(unsigned l return __get_vm_area_node(size, 1, flags, VMALLOC_START, VMALLOC_END, -1, GFP_KERNEL, __builtin_return_address(0)); } @@ -107,7 +107,7 @@ void *caller) --- a/include/linux/mm.h +++ b/include/linux/mm.h -@@ -872,6 +872,7 @@ extern bool skip_free_areas_node(unsigne +@@ -871,6 +871,7 @@ extern bool skip_free_areas_node(unsigne int shmem_lock(struct file *file, int lock, struct user_struct *user); struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags); |