kernel: remove wrong chunks from the 2.6.37 and 2.6.38 version of the mips oprofile fix

[openwrt.git] / target / linux / generic / patches-2.6.38 / 065-rootfs_split.patch

diff --git a/target/linux/generic/patches-2.6.38/065-rootfs_split.patch b/target/linux/generic/patches-2.6.38/065-rootfs_split.patch
index 04cc90a..7a82354 100644 (file)
--- a/target/linux/generic/patches-2.6.38/065-rootfs_split.patch
+++ b/target/linux/generic/patches-2.6.38/065-rootfs_split.patch
@@ -191,16 +191,17 @@
  /*
   * This function, given a master MTD object and a partition table, creates
   * and registers slave MTD objects which are bound to the master according to
  /*
   * This function, given a master MTD object and a partition table, creates
   * and registers slave MTD objects which are bound to the master according to

-@@ -651,7 +800,7 @@ int add_mtd_partitions(struct mtd_info *
- {
+@@ -652,6 +801,9 @@ int add_mtd_partitions(struct mtd_info *

        struct mtd_part *slave;
        uint64_t cur_offset = 0;
        struct mtd_part *slave;
        uint64_t cur_offset = 0;

--      int i;
-+      int i, ret;
+       int i;
++#ifdef CONFIG_MTD_ROOTFS_SPLIT
++      int ret;
++#endif

  
        printk(KERN_NOTICE "Creating %d MTD partitions on \"%s\":\n", nbparts, master->name);
  
  
        printk(KERN_NOTICE "Creating %d MTD partitions on \"%s\":\n", nbparts, master->name);
  

-@@ -666,6 +815,21 @@ int add_mtd_partitions(struct mtd_info *
+@@ -666,6 +818,21 @@ int add_mtd_partitions(struct mtd_info *

  
                add_mtd_device(&slave->mtd);
  
  
                add_mtd_device(&slave->mtd);
  


@@ -222,7 +223,7 @@
                cur_offset = slave->offset + slave->mtd.size;
        }
  
                cur_offset = slave->offset + slave->mtd.size;
        }
  

-@@ -673,6 +837,32 @@ int add_mtd_partitions(struct mtd_info *
+@@ -673,6 +840,32 @@ int add_mtd_partitions(struct mtd_info *

  }
  EXPORT_SYMBOL(add_mtd_partitions);
  
  }
  EXPORT_SYMBOL(add_mtd_partitions);
  


@@ -547,7 +548,7 @@
        part->name = dev->mtd.name;
 --- a/drivers/mtd/mtdchar.c
 +++ b/drivers/mtd/mtdchar.c
        part->name = dev->mtd.name;
 --- a/drivers/mtd/mtdchar.c
 +++ b/drivers/mtd/mtdchar.c

-@@ -841,6 +841,13 @@ static int mtd_ioctl(struct file *file,
+@@ -841,6 +841,13 @@ static int mtd_ioctl(struct file *file, 

                file->f_pos = 0;
                break;
        }
                file->f_pos = 0;
                break;
        }