projects / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Define more missing config symbols for .26
[openwrt.git] / target / linux / olpc / patches / 300-block2mtd_init.patch
diff --git a/target/linux/olpc/patches/300-block2mtd_init.patch b/target/linux/olpc/patches/300-block2mtd_init.patch
index 5d81f2f..a922b4e 100644 (file)
--- a/target/linux/olpc/patches/300-block2mtd_init.patch
+++ b/target/linux/olpc/patches/300-block2mtd_init.patch
@@ -1,16 +1,17 @@
-Index: linux-2.6.23/drivers/mtd/devices/block2mtd.c
+Index: linux-2.6.23.17/drivers/mtd/devices/block2mtd.c
 ===================================================================
---- linux-2.6.23.orig/drivers/mtd/devices/block2mtd.c  2007-10-25 21:43:40.854599193 +0200
-+++ linux-2.6.23/drivers/mtd/devices/block2mtd.c       2007-10-25 22:23:19.066125745 +0200
-@@ -20,6 +20,7 @@
+--- linux-2.6.23.17.orig/drivers/mtd/devices/block2mtd.c
++++ linux-2.6.23.17/drivers/mtd/devices/block2mtd.c
+@@ -20,6 +20,8 @@
  #include <linux/buffer_head.h>
  #include <linux/mutex.h>
  #include <linux/mount.h>
 +#include <linux/list.h>
++#include <linux/delay.h>
  
  #define VERSION "$Revision: 1.30 $"
  
-@@ -27,6 +28,12 @@
+@@ -27,6 +29,12 @@
  #define ERROR(fmt, args...) printk(KERN_ERR "block2mtd: " fmt "\n" , ## args)
  #define INFO(fmt, args...) printk(KERN_INFO "block2mtd: " fmt "\n" , ## args)
  
@@ -23,7 +24,7 @@ Index: linux-2.6.23/drivers/mtd/devices/block2mtd.c
  
  /* Info for the block device */
  struct block2mtd_dev {
-@@ -38,10 +45,36 @@
+@@ -38,10 +46,36 @@ struct block2mtd_dev {
        char devname[0];
  };
  
@@ -60,7 +61,7 @@ Index: linux-2.6.23/drivers/mtd/devices/block2mtd.c
  
  static struct page *page_read(struct address_space *mapping, int index)
  {
-@@ -518,7 +551,10 @@
+@@ -518,7 +552,10 @@ static int block2mtd_setup2(const char *
        if (token[2] && (strlen(token[2]) + 1 > 80))
                parse_err("mtd device name too long");
  
@@ -72,7 +73,7 @@ Index: linux-2.6.23/drivers/mtd/devices/block2mtd.c
  
        return 0;
  }
-@@ -534,8 +570,11 @@
+@@ -534,8 +571,11 @@ static int block2mtd_setup(const char *v
           and block2mtd_init() has already been called,
           we can parse the argument now. */
  
@@ -85,11 +86,11 @@ Index: linux-2.6.23/drivers/mtd/devices/block2mtd.c
  
        /* During early boot stage, we only save the parameters
           here. We must parse them later: if the param passed
-Index: linux-2.6.23/init/do_mounts.c
+Index: linux-2.6.23.17/init/do_mounts.c
 ===================================================================
---- linux-2.6.23.orig/init/do_mounts.c 2007-10-25 21:39:41.824977672 +0200
-+++ linux-2.6.23/init/do_mounts.c      2007-10-25 21:41:22.466712918 +0200
-@@ -241,16 +241,8 @@
+--- linux-2.6.23.17.orig/init/do_mounts.c
++++ linux-2.6.23.17/init/do_mounts.c
+@@ -241,16 +241,8 @@ static int __init fs_names_setup(char *s
        return 1;
  }
  
@@ -106,7 +107,7 @@ Index: linux-2.6.23/init/do_mounts.c
  
  static void __init get_fs_names(char *page)
  {
-@@ -426,18 +418,6 @@
+@@ -426,18 +418,6 @@ void __init prepare_namespace(void)
  {
        int is_floppy;
  
@@ -125,10 +126,10 @@ Index: linux-2.6.23/init/do_mounts.c
        if (saved_root_name[0]) {
                root_device_name = saved_root_name;
                if (!strncmp(root_device_name, "mtd", 3)) {
-Index: linux-2.6.23/init/main.c
+Index: linux-2.6.23.17/init/main.c
 ===================================================================
---- linux-2.6.23.orig/init/main.c      2007-10-25 21:35:50.567799083 +0200
-+++ linux-2.6.23/init/main.c   2007-10-25 21:56:43.279187031 +0200
+--- linux-2.6.23.17.orig/init/main.c
++++ linux-2.6.23.17/init/main.c
 @@ -65,6 +65,7 @@
  #ifdef CONFIG_X86_LOCAL_APIC
  #include <asm/smp.h>
@@ -137,7 +138,7 @@ Index: linux-2.6.23/init/main.c
  
  /*
   * This is one of the first .c files built. Error out early if we have compiler
-@@ -662,13 +663,14 @@
+@@ -662,13 +663,14 @@ static int __init initcall_debug_setup(c
  __setup("initcall_debug", initcall_debug_setup);
  
  extern initcall_t __initcall_start[], __initcall_end[];
@@ -154,7 +155,7 @@ Index: linux-2.6.23/init/main.c
                ktime_t t0, t1, delta;
                char *msg = NULL;
                char msgbuf[40];
-@@ -737,7 +739,7 @@
+@@ -737,7 +739,7 @@ static void __init do_basic_setup(void)
        usermodehelper_init();
        driver_init();
        init_irq_proc();
@@ -163,7 +164,7 @@ Index: linux-2.6.23/init/main.c
  }
  
  static int __initdata nosoftlockup;
-@@ -810,6 +812,14 @@
+@@ -810,6 +812,14 @@ static int noinline init_post(void)
        panic("No init found.  Try passing init= option to kernel.");
  }
  
@@ -178,7 +179,7 @@ Index: linux-2.6.23/init/main.c
  static int __init kernel_init(void * unused)
  {
        lock_kernel();
-@@ -851,6 +861,17 @@
+@@ -851,6 +861,17 @@ static int __init kernel_init(void * unu
  
        if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) {
                ramdisk_execute_command = NULL;
@@ -196,11 +197,11 @@ Index: linux-2.6.23/init/main.c
                prepare_namespace();
        }
  
-Index: linux-2.6.23/arch/i386/kernel/vmlinux.lds.S
+Index: linux-2.6.23.17/arch/i386/kernel/vmlinux.lds.S
 ===================================================================
---- linux-2.6.23.orig/arch/i386/kernel/vmlinux.lds.S   2007-10-26 00:07:08.465118962 +0200
-+++ linux-2.6.23/arch/i386/kernel/vmlinux.lds.S        2007-10-26 00:10:15.259763782 +0200
-@@ -146,6 +146,11 @@
+--- linux-2.6.23.17.orig/arch/i386/kernel/vmlinux.lds.S
++++ linux-2.6.23.17/arch/i386/kernel/vmlinux.lds.S
+@@ -146,6 +146,11 @@ SECTIONS
        INITCALLS
        __initcall_end = .;
    }
@@ -212,10 +213,10 @@ Index: linux-2.6.23/arch/i386/kernel/vmlinux.lds.S
    .con_initcall.init : AT(ADDR(.con_initcall.init) - LOAD_OFFSET) {
        __con_initcall_start = .;
        *(.con_initcall.init)
-Index: linux-2.6.23/include/asm-generic/vmlinux.lds.h
+Index: linux-2.6.23.17/include/asm-generic/vmlinux.lds.h
 ===================================================================
---- linux-2.6.23.orig/include/asm-generic/vmlinux.lds.h        2007-10-26 00:08:46.558708993 +0200
-+++ linux-2.6.23/include/asm-generic/vmlinux.lds.h     2007-10-26 00:09:24.296859571 +0200
+--- linux-2.6.23.17.orig/include/asm-generic/vmlinux.lds.h
++++ linux-2.6.23.17/include/asm-generic/vmlinux.lds.h
 @@ -243,12 +243,14 @@
        *(.initcall4s.init)                                             \
        *(.initcall5.init)                                              \
Personal OpenWRT clone
This page took 0.030518 seconds and 4 git commands to generate.