1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-04-21 12:27:27 +03:00

linux: update 3.1 to 3.1.1

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29007 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jogo
2011-11-13 10:48:05 +00:00
parent e5c40dc4c3
commit 85ec5ce98d
34 changed files with 211 additions and 397 deletions

View File

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

View File

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

View File

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

View File

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