Changeset 26690


Ignore:
Timestamp:
2011-04-16T20:30:57+02:00 (6 years ago)
Author:
nbd
Message:

kernel: reorganize 2.6.38 patches, clean up block2mtd patches

Location:
trunk/target/linux/generic/patches-2.6.38
Files:
2 added
2 deleted
105 moved

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/generic/patches-2.6.38/254-textsearch_kconfig_hacks.patch

    r26689 r26690  
    11--- a/lib/Kconfig 
    22+++ b/lib/Kconfig 
    3 @@ -164,16 +164,16 @@ config REED_SOLOMON_DEC16 
     3@@ -158,16 +158,16 @@ config REED_SOLOMON_DEC16 
    44 # Textsearch support is select'ed if needed 
    55 # 
  • trunk/target/linux/generic/patches-2.6.38/258-make_config_average_selectable.patch

    r26689 r26690  
    11--- a/lib/Kconfig 
    22+++ b/lib/Kconfig 
    3 @@ -223,6 +223,13 @@ config LRU_CACHE 
     3@@ -217,6 +217,13 @@ config LRU_CACHE 
    44        tristate 
    55  
  • trunk/target/linux/generic/patches-2.6.38/440-block2mtd_init.patch

    r26689 r26690  
    4848-       if (add_mtd_device(&dev->mtd)) { 
    4949+       part = kzalloc(sizeof(struct mtd_partition), GFP_KERNEL); 
    50 +       part->name = dev->mtd.name; 
     50+       part->name = name; 
    5151+       part->offset = 0; 
    5252+       part->size = dev->mtd.size; 
  • trunk/target/linux/generic/patches-2.6.38/442-block2mtd_probe.patch

    r26689 r26690  
    11--- a/drivers/mtd/devices/block2mtd.c 
    22+++ b/drivers/mtd/devices/block2mtd.c 
    3 @@ -268,6 +268,7 @@ static int _open_bdev(struct block2mtd_d 
     3@@ -269,6 +269,7 @@ static int _open_bdev(struct block2mtd_d 
    44                /* We might not have rootfs mounted at this point. Try 
    55                   to resolve the device name by other means. */ 
    66  
    77+               wait_for_device_probe(); 
    8                 dev_t devt = name_to_dev_t(dev->devname); 
     8                devt = name_to_dev_t(dev->devname); 
    99                if (devt) 
    1010                        bdev = blkdev_get_by_dev(devt, mode, dev); 
  • trunk/target/linux/generic/patches-2.6.38/502-yaffs_git_2010_10_20.patch

    r26689 r26690  
    99 endif # BLOCK 
    1010  
    11 @@ -176,6 +175,10 @@ source "fs/hfsplus/Kconfig" 
     11@@ -177,6 +176,10 @@ source "fs/hfsplus/Kconfig" 
    1212 source "fs/befs/Kconfig" 
    1313 source "fs/bfs/Kconfig" 
  • trunk/target/linux/generic/patches-2.6.38/600-netfilter_layer7_2.22.patch

    r26689 r26690  
    11--- a/net/netfilter/Kconfig 
    22+++ b/net/netfilter/Kconfig 
    3 @@ -948,6 +948,27 @@ config NETFILTER_XT_MATCH_STATE 
     3@@ -946,6 +946,27 @@ config NETFILTER_XT_MATCH_STATE 
    44  
    55          To compile it as a module, choose M here.  If unsure, say N. 
  • trunk/target/linux/generic/patches-2.6.38/603-netfilter_layer7_2.6.36_fix.patch

    r26689 r26690  
    11--- a/net/netfilter/Kconfig 
    22+++ b/net/netfilter/Kconfig 
    3 @@ -762,6 +762,27 @@ config NETFILTER_XT_MATCH_IPVS 
     3@@ -760,6 +760,27 @@ config NETFILTER_XT_MATCH_IPVS 
    44  
    55          If unsure, say N. 
     
    2929        tristate '"length" match support' 
    3030        depends on NETFILTER_ADVANCED 
    31 @@ -948,26 +969,11 @@ config NETFILTER_XT_MATCH_STATE 
     31@@ -946,26 +967,11 @@ config NETFILTER_XT_MATCH_STATE 
    3232  
    3333          To compile it as a module, choose M here.  If unsure, say N. 
  • trunk/target/linux/generic/patches-2.6.38/720-phy_adm6996.patch

    r26689 r26690  
    11--- a/drivers/net/phy/Kconfig 
    22+++ b/drivers/net/phy/Kconfig 
    3 @@ -92,6 +92,11 @@ config MICREL_PHY 
     3@@ -98,6 +98,11 @@ config MICREL_PHY 
    44        ---help--- 
    55          Supports the KSZ9021, VSC8201, KS8001 PHYs. 
     
    1515--- a/drivers/net/phy/Makefile 
    1616+++ b/drivers/net/phy/Makefile 
    17 @@ -13,6 +13,7 @@ obj-$(CONFIG_VITESSE_PHY)     += vitesse.o 
     17@@ -14,6 +14,7 @@ obj-$(CONFIG_VITESSE_PHY)     += vitesse.o 
    1818 obj-$(CONFIG_BROADCOM_PHY)     += broadcom.o 
    1919 obj-$(CONFIG_BCM63XX_PHY)      += bcm63xx.o 
  • trunk/target/linux/generic/patches-2.6.38/810-pci_disable_common_quirks.patch

    r26689 r26690  
    1 Index: 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 
     1--- a/drivers/pci/Kconfig 
     2+++ b/drivers/pci/Kconfig 
    53@@ -62,6 +62,12 @@ config XEN_PCIDEV_FE_DEBUG 
    64  
     
    1614        bool "Interrupts on hypertransport devices" 
    1715        default y 
    18 Index: 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 
     16--- a/drivers/pci/quirks.c 
     17+++ b/drivers/pci/quirks.c 
    2218@@ -104,6 +104,7 @@ static void __devinit quirk_mmio_always_ 
    2319 } 
  • trunk/target/linux/generic/patches-2.6.38/821-usb_serial_endpoint_size.patch

    r26689 r26690  
    1 Index: 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 
     1--- a/drivers/usb/serial/usb-serial.c 
     2+++ b/drivers/usb/serial/usb-serial.c 
    53@@ -61,6 +61,7 @@ static struct usb_driver usb_serial_driv 
    64    drivers depend on it. 
  • trunk/target/linux/generic/patches-2.6.38/950-vm_exports.patch

    r26689 r26690  
    1 Index: 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-30 18:44:41.068346925 +0200 
     1--- a/mm/shmem.c 
     2+++ b/mm/shmem.c 
    53@@ -2710,6 +2710,16 @@ out: 
    64  
     
    3331        return 0; 
    3432 } 
    35 Index: linux-2.6.38.2/fs/file.c 
    36 =================================================================== 
    37 --- linux-2.6.38.2.orig/fs/file.c       2011-03-27 20:37:20.000000000 +0200 
    38 +++ linux-2.6.38.2/fs/file.c    2011-03-28 22:44:57.267151662 +0200 
     33--- a/fs/file.c 
     34+++ b/fs/file.c 
    3935@@ -264,6 +264,7 @@ int expand_files(struct files_struct *fi 
    4036        /* All good, so we try */ 
     
    4541 static int count_open_files(struct fdtable *fdt) 
    4642 { 
    47 Index: linux-2.6.38.2/kernel/exit.c 
    48 =================================================================== 
    49 --- linux-2.6.38.2.orig/kernel/exit.c   2011-03-27 20:37:20.000000000 +0200 
    50 +++ linux-2.6.38.2/kernel/exit.c        2011-03-28 22:44:57.269151650 +0200 
     43--- a/kernel/exit.c 
     44+++ b/kernel/exit.c 
    5145@@ -513,6 +513,7 @@ struct files_struct *get_files_struct(st 
    5246  
     
    6559 void reset_files_struct(struct files_struct *files) 
    6660 { 
    67 Index: linux-2.6.38.2/kernel/fork.c 
    68 =================================================================== 
    69 --- linux-2.6.38.2.orig/kernel/fork.c   2011-03-27 20:37:20.000000000 +0200 
    70 +++ linux-2.6.38.2/kernel/fork.c        2011-03-28 22:44:57.270151644 +0200 
     61--- a/kernel/fork.c 
     62+++ b/kernel/fork.c 
    7163@@ -193,6 +193,7 @@ void __put_task_struct(struct task_struc 
    7264        if (!profile_handoff_task(tsk)) 
     
    7769 /* 
    7870  * macro override instead of weak attribute alias, to workaround 
    79 Index: linux-2.6.38.2/kernel/sched.c 
    80 =================================================================== 
    81 --- linux-2.6.38.2.orig/kernel/sched.c  2011-03-27 20:37:20.000000000 +0200 
    82 +++ linux-2.6.38.2/kernel/sched.c       2011-03-28 22:44:57.274151620 +0200 
     71--- a/kernel/sched.c 
     72+++ b/kernel/sched.c 
    8373@@ -4641,6 +4641,7 @@ int can_nice(const struct task_struct *p 
    8474        return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) || 
     
    8979 #ifdef __ARCH_WANT_SYS_NICE 
    9080  
    91 Index: linux-2.6.38.2/mm/memory.c 
    92 =================================================================== 
    93 --- linux-2.6.38.2.orig/mm/memory.c     2011-03-27 20:37:20.000000000 +0200 
    94 +++ linux-2.6.38.2/mm/memory.c  2011-03-28 22:44:57.277151603 +0200 
     81--- a/mm/memory.c 
     82+++ b/mm/memory.c 
    9583@@ -1229,6 +1229,7 @@ unsigned long zap_page_range(struct vm_a 
    9684                tlb_finish_mmu(tlb, address, end); 
     
    10997 /* 
    11098  * We enter with non-exclusive mmap_sem (to exclude vma changes, 
    111 Index: linux-2.6.38.2/mm/vmalloc.c 
    112 =================================================================== 
    113 --- linux-2.6.38.2.orig/mm/vmalloc.c    2011-03-27 20:37:20.000000000 +0200 
    114 +++ linux-2.6.38.2/mm/vmalloc.c 2011-03-28 22:44:57.278151598 +0200 
     99--- a/mm/vmalloc.c 
     100+++ b/mm/vmalloc.c 
    115101@@ -1193,6 +1193,7 @@ void unmap_kernel_range(unsigned long ad 
    116102        vunmap_page_range(addr, end); 
     
    129115 struct vm_struct *get_vm_area_caller(unsigned long size, unsigned long flags, 
    130116                                void *caller) 
    131 Index: linux-2.6.38.2/include/linux/mm.h 
    132 =================================================================== 
    133 --- linux-2.6.38.2.orig/include/linux/mm.h      2011-03-27 20:37:20.000000000 +0200 
    134 +++ linux-2.6.38.2/include/linux/mm.h   2011-03-28 22:44:57.279151592 +0200 
     117--- a/include/linux/mm.h 
     118+++ b/include/linux/mm.h 
    135119@@ -863,6 +863,7 @@ extern void show_free_areas(void); 
    136120  
Note: See TracChangeset for help on using the changeset viewer.