Changeset 26332


Ignore:
Timestamp:
2011-03-28T17:44:03+02:00 (7 years ago)
Author:
mb
Message:

Update 2.6.38 to 2.6.38.2

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/kernel-version.mk

    r26226 r26332  
    2424  LINUX_KERNEL_MD5SUM:=1d2dc321017a8dde09b779b4d8233273 
    2525endif 
    26 ifeq ($(LINUX_VERSION),2.6.38) 
    27   LINUX_KERNEL_MD5SUM:=7d471477bfa67546f902da62227fa976 
     26ifeq ($(LINUX_VERSION),2.6.38.2) 
     27  LINUX_KERNEL_MD5SUM:=5e9d0edae15053ea9acd932e6d162d03 
    2828endif 
    2929 
  • trunk/target/linux/at91/Makefile

    r26300 r26332  
    1515SUBTARGETS:=netus tqma9263 
    1616 
    17 LINUX_VERSION:=2.6.38 
     17LINUX_VERSION:=2.6.38.2 
    1818DEVICE_TYPE= 
    1919 
  • trunk/target/linux/generic/config-2.6.38

    r26267 r26332  
    802802# CONFIG_HID_ZEROPLUS is not set 
    803803# CONFIG_HID_ZYDACRON is not set 
     804# CONFIG_HID_ACRUX is not set 
    804805# CONFIG_HIGHMEM is not set 
    805806CONFIG_HIGH_RES_TIMERS=y 
  • trunk/target/linux/generic/patches-2.6.38/030-pci_disable_common_quirks.patch

    r25057 r26332  
    1 --- a/drivers/pci/Kconfig 
    2 +++ b/drivers/pci/Kconfig 
     1Index: linux-2.6.38.1/drivers/pci/Kconfig 
     2=================================================================== 
     3--- linux-2.6.38.1.orig/drivers/pci/Kconfig     2011-03-23 21:04:47.000000000 +0100 
     4+++ linux-2.6.38.1/drivers/pci/Kconfig  2011-03-28 16:48:00.052118712 +0200 
    35@@ -62,6 +62,12 @@ config XEN_PCIDEV_FE_DEBUG 
    46  
     
    1416        bool "Interrupts on hypertransport devices" 
    1517        default y 
    16 --- a/drivers/pci/quirks.c 
    17 +++ b/drivers/pci/quirks.c 
     18Index: linux-2.6.38.1/drivers/pci/quirks.c 
     19=================================================================== 
     20--- linux-2.6.38.1.orig/drivers/pci/quirks.c    2011-03-23 21:04:47.000000000 +0100 
     21+++ linux-2.6.38.1/drivers/pci/quirks.c 2011-03-28 16:48:13.130041612 +0200 
    1822@@ -104,6 +104,7 @@ static void __devinit quirk_mmio_always_ 
    1923 } 
     
    2428  * Mark this device with a broken_parity_status, to allow 
    2529  * PCI scanning code to "skip" this now blacklisted device. 
    26 @@ -1944,7 +1945,9 @@ static void __devinit fixup_rev1_53c810( 
     30@@ -1989,7 +1990,9 @@ static void __devinit fixup_rev1_53c810( 
    2731        } 
    2832 } 
     
    3438 static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev) 
    3539 { 
    36 @@ -2669,6 +2672,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I 
    37  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1518, quirk_i82576_sriov); 
     40@@ -2662,6 +2665,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AT 
     41                        quirk_msi_intx_disable_bug); 
    3842  
    39  #endif /* CONFIG_PCI_IOV */ 
     43 #endif /* CONFIG_PCI_MSI */ 
    4044+#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */ 
    4145  
  • trunk/target/linux/generic/patches-2.6.38/801-usb_serial_endpoint_size.patch

    r25805 r26332  
    1 --- a/drivers/usb/serial/usb-serial.c 
    2 +++ b/drivers/usb/serial/usb-serial.c 
     1Index: linux-2.6.38.1/drivers/usb/serial/usb-serial.c 
     2=================================================================== 
     3--- linux-2.6.38.1.orig/drivers/usb/serial/usb-serial.c 2011-03-23 21:04:47.000000000 +0100 
     4+++ linux-2.6.38.1/drivers/usb/serial/usb-serial.c      2011-03-28 16:58:26.673254994 +0200 
    35@@ -61,6 +61,7 @@ static struct usb_driver usb_serial_driv 
    46    drivers depend on it. 
     
    911 /* initially all NULL */ 
    1012 static struct usb_serial *serial_table[SERIAL_TTY_MINORS]; 
    11 @@ -913,7 +914,7 @@ int usb_serial_probe(struct usb_interfac 
     13@@ -912,7 +913,8 @@ int usb_serial_probe(struct usb_interfac 
     14                        goto probe_error; 
    1215                } 
    13                 buffer_size = serial->type->bulk_in_size; 
    14                 if (!buffer_size) 
    15 -                       buffer_size = le16_to_cpu(endpoint->wMaxPacketSize); 
    16 +                       buffer_size = (endpoint->wMaxPacketSize > maxSize) ? endpoint->wMaxPacketSize : maxSize; 
     16                buffer_size = max_t(int, serial->type->bulk_in_size, 
     17-                               le16_to_cpu(endpoint->wMaxPacketSize)); 
     18+                                        min_t(int, le16_to_cpu(endpoint->wMaxPacketSize), 
     19+                                                   maxSize)); 
    1720                port->bulk_in_size = buffer_size; 
    1821                port->bulk_in_endpointAddress = endpoint->bEndpointAddress; 
    1922                port->bulk_in_buffer = kmalloc(buffer_size, GFP_KERNEL); 
    20 @@ -1392,3 +1393,5 @@ MODULE_LICENSE("GPL"); 
     23@@ -1391,3 +1393,5 @@ MODULE_LICENSE("GPL"); 
    2124  
    2225 module_param(debug, bool, S_IRUGO | S_IWUSR); 
  • trunk/target/linux/generic/patches-2.6.38/980-vm_exports.patch

    r26194 r26332  
    1 --- a/mm/shmem.c 
    2 +++ b/mm/shmem.c 
     1Index: linux-2.6.38.2/mm/shmem.c 
     2=================================================================== 
     3--- linux-2.6.38.2.orig/mm/shmem.c      2011-03-27 20:37:20.000000000 +0200 
     4+++ linux-2.6.38.2/mm/shmem.c   2011-03-28 17:18:35.142293910 +0200 
    35@@ -30,6 +30,7 @@ 
    46 #include <linux/module.h> 
     
    2628  * shmem_file_setup - get an unlinked file living in tmpfs 
    2729  * @name: name for dentry (to be seen in /proc/<pid>/maps 
    28 @@ -2787,9 +2798,6 @@ int shmem_zero_setup(struct vm_area_stru 
     30@@ -2787,10 +2798,7 @@ int shmem_zero_setup(struct vm_area_stru 
    2931        if (IS_ERR(file)) 
    3032                return PTR_ERR(file); 
     
    3537-       vma->vm_ops = &shmem_vm_ops; 
    3638+       shmem_set_file(vma, file); 
     39        vma->vm_flags |= VM_CAN_NONLINEAR; 
    3740        return 0; 
    3841 } 
    39 --- a/fs/file.c 
    40 +++ b/fs/file.c 
     42Index: linux-2.6.38.2/fs/file.c 
     43=================================================================== 
     44--- linux-2.6.38.2.orig/fs/file.c       2011-03-27 20:37:20.000000000 +0200 
     45+++ linux-2.6.38.2/fs/file.c    2011-03-28 17:18:24.755353654 +0200 
    4146@@ -264,6 +264,7 @@ int expand_files(struct files_struct *fi 
    4247        /* All good, so we try */ 
     
    4752 static int count_open_files(struct fdtable *fdt) 
    4853 { 
    49 --- a/kernel/exit.c 
    50 +++ b/kernel/exit.c 
     54Index: linux-2.6.38.2/kernel/exit.c 
     55=================================================================== 
     56--- linux-2.6.38.2.orig/kernel/exit.c   2011-03-27 20:37:20.000000000 +0200 
     57+++ linux-2.6.38.2/kernel/exit.c        2011-03-28 17:18:24.755353654 +0200 
    5158@@ -513,6 +513,7 @@ struct files_struct *get_files_struct(st 
    5259  
     
    6572 void reset_files_struct(struct files_struct *files) 
    6673 { 
    67 --- a/kernel/fork.c 
    68 +++ b/kernel/fork.c 
     74Index: linux-2.6.38.2/kernel/fork.c 
     75=================================================================== 
     76--- linux-2.6.38.2.orig/kernel/fork.c   2011-03-27 20:37:20.000000000 +0200 
     77+++ linux-2.6.38.2/kernel/fork.c        2011-03-28 17:18:24.755353654 +0200 
    6978@@ -193,6 +193,7 @@ void __put_task_struct(struct task_struc 
    7079        if (!profile_handoff_task(tsk)) 
     
    7584 /* 
    7685  * macro override instead of weak attribute alias, to workaround 
    77 --- a/kernel/sched.c 
    78 +++ b/kernel/sched.c 
     86Index: linux-2.6.38.2/kernel/sched.c 
     87=================================================================== 
     88--- linux-2.6.38.2.orig/kernel/sched.c  2011-03-27 20:37:20.000000000 +0200 
     89+++ linux-2.6.38.2/kernel/sched.c       2011-03-28 17:18:24.757353643 +0200 
    7990@@ -4641,6 +4641,7 @@ int can_nice(const struct task_struct *p 
    8091        return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) || 
     
    8596 #ifdef __ARCH_WANT_SYS_NICE 
    8697  
    87 --- a/mm/memory.c 
    88 +++ b/mm/memory.c 
     98Index: linux-2.6.38.2/mm/memory.c 
     99=================================================================== 
     100--- linux-2.6.38.2.orig/mm/memory.c     2011-03-27 20:37:20.000000000 +0200 
     101+++ linux-2.6.38.2/mm/memory.c  2011-03-28 17:18:24.757353643 +0200 
    89102@@ -1229,6 +1229,7 @@ unsigned long zap_page_range(struct vm_a 
    90103                tlb_finish_mmu(tlb, address, end); 
     
    103116 /* 
    104117  * We enter with non-exclusive mmap_sem (to exclude vma changes, 
    105 --- a/mm/vmalloc.c 
    106 +++ b/mm/vmalloc.c 
     118Index: linux-2.6.38.2/mm/vmalloc.c 
     119=================================================================== 
     120--- linux-2.6.38.2.orig/mm/vmalloc.c    2011-03-27 20:37:20.000000000 +0200 
     121+++ linux-2.6.38.2/mm/vmalloc.c 2011-03-28 17:18:24.758353638 +0200 
    107122@@ -1193,6 +1193,7 @@ void unmap_kernel_range(unsigned long ad 
    108123        vunmap_page_range(addr, end); 
     
    121136 struct vm_struct *get_vm_area_caller(unsigned long size, unsigned long flags, 
    122137                                void *caller) 
    123 --- a/include/linux/mm.h 
    124 +++ b/include/linux/mm.h 
    125 @@ -856,6 +856,7 @@ extern void show_free_areas(void); 
     138Index: linux-2.6.38.2/include/linux/mm.h 
     139=================================================================== 
     140--- linux-2.6.38.2.orig/include/linux/mm.h      2011-03-27 20:37:20.000000000 +0200 
     141+++ linux-2.6.38.2/include/linux/mm.h   2011-03-28 17:18:24.758353638 +0200 
     142@@ -863,6 +863,7 @@ extern void show_free_areas(void); 
    126143  
    127144 int shmem_lock(struct file *file, int lock, struct user_struct *user); 
  • trunk/target/linux/mpc85xx/Makefile

    r26300 r26332  
    1414MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> 
    1515 
    16 LINUX_VERSION:=2.6.38 
     16LINUX_VERSION:=2.6.38.2 
    1717 
    1818include $(INCLUDE_DIR)/target.mk 
  • trunk/target/linux/omap24xx/Makefile

    r26244 r26332  
    1313FEATURES:=targz squashfs jffs2 usb usbgadget display gpio audio 
    1414 
    15 LINUX_VERSION:=2.6.38 
     15LINUX_VERSION:=2.6.38.2 
    1616 
    1717define Target/Description 
Note: See TracChangeset for help on using the changeset viewer.