Update 2.6.38 to 2.6.38.2

SVN-Revision: 26332

4 files changed, 59 insertions, 34 deletions

diff --git a/target/linux/generic/config-2.6.38 b/target/linux/generic/config-2.6.38
index 71cb2678c0..2657eb9d17 100644
--- a/target/linux/generic/config-2.6.38
+++ b/target/linux/generic/config-2.6.38
@@ -801,6 +801,7 @@ CONFIG_HAVE_KRETPROBES=y
 # CONFIG_HID_WALTOP is not set
 # CONFIG_HID_ZEROPLUS is not set
 # CONFIG_HID_ZYDACRON is not set
+# CONFIG_HID_ACRUX is not set
 # CONFIG_HIGHMEM is not set
 CONFIG_HIGH_RES_TIMERS=y
 # CONFIG_HIPPI is not set
diff --git a/target/linux/generic/patches-2.6.38/030-pci_disable_common_quirks.patch b/target/linux/generic/patches-2.6.38/030-pci_disable_common_quirks.patch
index e5d647d189..b81ab74dce 100644
--- a/target/linux/generic/patches-2.6.38/030-pci_disable_common_quirks.patch
+++ b/target/linux/generic/patches-2.6.38/030-pci_disable_common_quirks.patch
@@ -1,5 +1,7 @@
---- a/drivers/pci/Kconfig
-+++ b/drivers/pci/Kconfig
+Index: linux-2.6.38.1/drivers/pci/Kconfig
+===================================================================
+--- linux-2.6.38.1.orig/drivers/pci/Kconfig	2011-03-23 21:04:47.000000000 +0100
++++ linux-2.6.38.1/drivers/pci/Kconfig	2011-03-28 16:48:00.052118712 +0200
 @@ -62,6 +62,12 @@ config XEN_PCIDEV_FE_DEBUG
  
  	  When in doubt, say N.
@@ -13,8 +15,10 @@
  config HT_IRQ
  	bool "Interrupts on hypertransport devices"
  	default y
---- a/drivers/pci/quirks.c
-+++ b/drivers/pci/quirks.c
+Index: linux-2.6.38.1/drivers/pci/quirks.c
+===================================================================
+--- linux-2.6.38.1.orig/drivers/pci/quirks.c	2011-03-23 21:04:47.000000000 +0100
++++ linux-2.6.38.1/drivers/pci/quirks.c	2011-03-28 16:48:13.130041612 +0200
 @@ -104,6 +104,7 @@ static void __devinit quirk_mmio_always_
  }
  DECLARE_PCI_FIXUP_EARLY(PCI_ANY_ID, PCI_ANY_ID, quirk_mmio_always_on);
@@ -23,7 +27,7 @@
  /* The Mellanox Tavor device gives false positive parity errors
   * Mark this device with a broken_parity_status, to allow
   * PCI scanning code to "skip" this now blacklisted device.
-@@ -1944,7 +1945,9 @@ static void __devinit fixup_rev1_53c810(
+@@ -1989,7 +1990,9 @@ static void __devinit fixup_rev1_53c810(
  	}
  }
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1_53c810);
@@ -33,10 +37,10 @@
  /* Enable 1k I/O space granularity on the Intel P64H2 */
  static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev)
  {
-@@ -2669,6 +2672,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
- DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1518, quirk_i82576_sriov);
+@@ -2662,6 +2665,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AT
+ 			quirk_msi_intx_disable_bug);
  
- #endif	/* CONFIG_PCI_IOV */
+ #endif /* CONFIG_PCI_MSI */
 +#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */
  
  /* Allow manual resource allocation for PCI hotplug bridges
diff --git a/target/linux/generic/patches-2.6.38/801-usb_serial_endpoint_size.patch b/target/linux/generic/patches-2.6.38/801-usb_serial_endpoint_size.patch
index 3725b922ce..726dc7dd53 100644
--- a/target/linux/generic/patches-2.6.38/801-usb_serial_endpoint_size.patch
+++ b/target/linux/generic/patches-2.6.38/801-usb_serial_endpoint_size.patch
@@ -1,5 +1,7 @@
---- a/drivers/usb/serial/usb-serial.c
-+++ b/drivers/usb/serial/usb-serial.c
+Index: linux-2.6.38.1/drivers/usb/serial/usb-serial.c
+===================================================================
+--- linux-2.6.38.1.orig/drivers/usb/serial/usb-serial.c	2011-03-23 21:04:47.000000000 +0100
++++ linux-2.6.38.1/drivers/usb/serial/usb-serial.c	2011-03-28 16:58:26.673254994 +0200
 @@ -61,6 +61,7 @@ static struct usb_driver usb_serial_driv
     drivers depend on it.
  */
@@ -8,16 +10,17 @@
  static int debug;
  /* initially all NULL */
  static struct usb_serial *serial_table[SERIAL_TTY_MINORS];
-@@ -913,7 +914,7 @@ int usb_serial_probe(struct usb_interfac
+@@ -912,7 +913,8 @@ int usb_serial_probe(struct usb_interfac
+ 			goto probe_error;
  		}
- 		buffer_size = serial->type->bulk_in_size;
- 		if (!buffer_size)
--			buffer_size = le16_to_cpu(endpoint->wMaxPacketSize);
-+			buffer_size = (endpoint->wMaxPacketSize > maxSize) ? endpoint->wMaxPacketSize : maxSize;
+ 		buffer_size = max_t(int, serial->type->bulk_in_size,
+-				le16_to_cpu(endpoint->wMaxPacketSize));
++					 min_t(int, le16_to_cpu(endpoint->wMaxPacketSize),
++						    maxSize));
  		port->bulk_in_size = buffer_size;
  		port->bulk_in_endpointAddress = endpoint->bEndpointAddress;
  		port->bulk_in_buffer = kmalloc(buffer_size, GFP_KERNEL);
-@@ -1392,3 +1393,5 @@ MODULE_LICENSE("GPL");
+@@ -1391,3 +1393,5 @@ MODULE_LICENSE("GPL");
  
  module_param(debug, bool, S_IRUGO | S_IWUSR);
  MODULE_PARM_DESC(debug, "Debug enabled or not");
diff --git a/target/linux/generic/patches-2.6.38/980-vm_exports.patch b/target/linux/generic/patches-2.6.38/980-vm_exports.patch
index 9bafb4870d..a945fb56da 100644
--- a/target/linux/generic/patches-2.6.38/980-vm_exports.patch
+++ b/target/linux/generic/patches-2.6.38/980-vm_exports.patch
@@ -1,5 +1,7 @@
---- a/mm/shmem.c
-+++ b/mm/shmem.c
+Index: linux-2.6.38.2/mm/shmem.c
+===================================================================
+--- linux-2.6.38.2.orig/mm/shmem.c	2011-03-27 20:37:20.000000000 +0200
++++ linux-2.6.38.2/mm/shmem.c	2011-03-28 17:18:35.142293910 +0200
 @@ -30,6 +30,7 @@
  #include <linux/module.h>
  #include <linux/percpu_counter.h>
@@ -25,7 +27,7 @@
  /**
   * shmem_file_setup - get an unlinked file living in tmpfs
   * @name: name for dentry (to be seen in /proc/<pid>/maps
-@@ -2787,9 +2798,6 @@ int shmem_zero_setup(struct vm_area_stru
+@@ -2787,10 +2798,7 @@ int shmem_zero_setup(struct vm_area_stru
  	if (IS_ERR(file))
  		return PTR_ERR(file);
  
@@ -34,10 +36,13 @@
 -	vma->vm_file = file;
 -	vma->vm_ops = &shmem_vm_ops;
 +	shmem_set_file(vma, file);
+ 	vma->vm_flags |= VM_CAN_NONLINEAR;
  	return 0;
  }
---- a/fs/file.c
-+++ b/fs/file.c
+Index: linux-2.6.38.2/fs/file.c
+===================================================================
+--- linux-2.6.38.2.orig/fs/file.c	2011-03-27 20:37:20.000000000 +0200
++++ linux-2.6.38.2/fs/file.c	2011-03-28 17:18:24.755353654 +0200
 @@ -264,6 +264,7 @@ int expand_files(struct files_struct *fi
  	/* All good, so we try */
  	return expand_fdtable(files, nr);
@@ -46,8 +51,10 @@
  
  static int count_open_files(struct fdtable *fdt)
  {
---- a/kernel/exit.c
-+++ b/kernel/exit.c
+Index: linux-2.6.38.2/kernel/exit.c
+===================================================================
+--- linux-2.6.38.2.orig/kernel/exit.c	2011-03-27 20:37:20.000000000 +0200
++++ linux-2.6.38.2/kernel/exit.c	2011-03-28 17:18:24.755353654 +0200
 @@ -513,6 +513,7 @@ struct files_struct *get_files_struct(st
  
  	return files;
@@ -64,8 +71,10 @@
  
  void reset_files_struct(struct files_struct *files)
  {
---- a/kernel/fork.c
-+++ b/kernel/fork.c
+Index: linux-2.6.38.2/kernel/fork.c
+===================================================================
+--- linux-2.6.38.2.orig/kernel/fork.c	2011-03-27 20:37:20.000000000 +0200
++++ linux-2.6.38.2/kernel/fork.c	2011-03-28 17:18:24.755353654 +0200
 @@ -193,6 +193,7 @@ void __put_task_struct(struct task_struc
  	if (!profile_handoff_task(tsk))
  		free_task(tsk);
@@ -74,8 +83,10 @@
  
  /*
   * macro override instead of weak attribute alias, to workaround
---- a/kernel/sched.c
-+++ b/kernel/sched.c
+Index: linux-2.6.38.2/kernel/sched.c
+===================================================================
+--- linux-2.6.38.2.orig/kernel/sched.c	2011-03-27 20:37:20.000000000 +0200
++++ linux-2.6.38.2/kernel/sched.c	2011-03-28 17:18:24.757353643 +0200
 @@ -4641,6 +4641,7 @@ int can_nice(const struct task_struct *p
  	return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
  		capable(CAP_SYS_NICE));
@@ -84,8 +95,10 @@
  
  #ifdef __ARCH_WANT_SYS_NICE
  
---- a/mm/memory.c
-+++ b/mm/memory.c
+Index: linux-2.6.38.2/mm/memory.c
+===================================================================
+--- linux-2.6.38.2.orig/mm/memory.c	2011-03-27 20:37:20.000000000 +0200
++++ linux-2.6.38.2/mm/memory.c	2011-03-28 17:18:24.757353643 +0200
 @@ -1229,6 +1229,7 @@ unsigned long zap_page_range(struct vm_a
  		tlb_finish_mmu(tlb, address, end);
  	return end;
@@ -102,8 +115,10 @@
  
  /*
   * We enter with non-exclusive mmap_sem (to exclude vma changes,
---- a/mm/vmalloc.c
-+++ b/mm/vmalloc.c
+Index: linux-2.6.38.2/mm/vmalloc.c
+===================================================================
+--- linux-2.6.38.2.orig/mm/vmalloc.c	2011-03-27 20:37:20.000000000 +0200
++++ linux-2.6.38.2/mm/vmalloc.c	2011-03-28 17:18:24.758353638 +0200
 @@ -1193,6 +1193,7 @@ void unmap_kernel_range(unsigned long ad
  	vunmap_page_range(addr, end);
  	flush_tlb_kernel_range(addr, end);
@@ -120,9 +135,11 @@
  
  struct vm_struct *get_vm_area_caller(unsigned long size, unsigned long flags,
  				void *caller)
---- a/include/linux/mm.h
-+++ b/include/linux/mm.h
-@@ -856,6 +856,7 @@ extern void show_free_areas(void);
+Index: linux-2.6.38.2/include/linux/mm.h
+===================================================================
+--- linux-2.6.38.2.orig/include/linux/mm.h	2011-03-27 20:37:20.000000000 +0200
++++ linux-2.6.38.2/include/linux/mm.h	2011-03-28 17:18:24.758353638 +0200
+@@ -863,6 +863,7 @@ extern void show_free_areas(void);
  
  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);