Changeset 18337


Ignore:
Timestamp:
2009-11-07T14:36:32+01:00 (8 years ago)
Author:
florian
Message:

[x86] add again missing hunk in vmlinux.lds.S

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/target/linux/x86/patches-2.6.31/300-block2mtd_init.patch

    r18336 r18337  
     1Index: linux-2.6.31.5/arch/x86/kernel/vmlinux.lds.S 
     2=================================================================== 
     3--- linux-2.6.31.5.orig/arch/x86/kernel/vmlinux.lds.S   2009-10-23 00:57:56.000000000 +0200 
     4+++ linux-2.6.31.5/arch/x86/kernel/vmlinux.lds.S        2009-11-07 14:31:54.000000000 +0100 
     5@@ -244,6 +244,12 @@ 
     6                __initcall_end = .; 
     7        } 
     8  
     9+       .root_initcall.init : AT(ADDR(.root_initcall.init) - LOAD_OFFSET) { 
     10+               __root_initcall_start = .; 
     11+               INITCALLS_ROOT 
     12+               __root_initcall_end = .; 
     13+       } 
     14+ 
     15        .con_initcall.init : AT(ADDR(.con_initcall.init) - LOAD_OFFSET) { 
     16                __con_initcall_start = .; 
     17                *(.con_initcall.init) 
    118Index: linux-2.6.31.5/drivers/mtd/devices/block2mtd.c 
    219=================================================================== 
    3 --- linux-2.6.31.5.orig/drivers/mtd/devices/block2mtd.c 2009-11-07 13:52:05.000000000 +0100 
    4 +++ linux-2.6.31.5/drivers/mtd/devices/block2mtd.c      2009-11-07 13:52:17.000000000 +0100 
     20--- linux-2.6.31.5.orig/drivers/mtd/devices/block2mtd.c 2009-11-07 14:30:57.000000000 +0100 
     21+++ linux-2.6.31.5/drivers/mtd/devices/block2mtd.c      2009-11-07 14:31:19.000000000 +0100 
    522@@ -18,10 +18,18 @@ 
    623 #include <linux/buffer_head.h> 
    … …  
    7087Index: linux-2.6.31.5/include/asm-generic/vmlinux.lds.h 
    7188=================================================================== 
    72 --- linux-2.6.31.5.orig/include/asm-generic/vmlinux.lds.h       2009-11-07 13:52:04.000000000 +0100 
    73 +++ linux-2.6.31.5/include/asm-generic/vmlinux.lds.h    2009-11-07 13:52:17.000000000 +0100 
     89--- linux-2.6.31.5.orig/include/asm-generic/vmlinux.lds.h       2009-11-07 14:30:57.000000000 +0100 
     90+++ linux-2.6.31.5/include/asm-generic/vmlinux.lds.h    2009-11-07 14:31:19.000000000 +0100 
    7491@@ -622,12 +622,14 @@ 
    7592        *(.initcall4s.init)                                             \ 
    … …  
    91108=================================================================== 
    92109--- linux-2.6.31.5.orig/init/do_mounts.c        2009-10-23 00:57:56.000000000 +0200 
    93 +++ linux-2.6.31.5/init/do_mounts.c     2009-11-07 13:52:17.000000000 +0100 
     110+++ linux-2.6.31.5/init/do_mounts.c     2009-11-07 14:31:19.000000000 +0100 
    94111@@ -176,16 +176,8 @@ 
    95112        return 1; 
    … …  
    135152Index: linux-2.6.31.5/init/main.c 
    136153=================================================================== 
    137 --- linux-2.6.31.5.orig/init/main.c     2009-11-07 13:52:16.000000000 +0100 
    138 +++ linux-2.6.31.5/init/main.c  2009-11-07 14:00:29.000000000 +0100 
     154--- linux-2.6.31.5.orig/init/main.c     2009-11-07 14:30:59.000000000 +0100 
     155+++ linux-2.6.31.5/init/main.c  2009-11-07 14:31:19.000000000 +0100 
    139156@@ -79,6 +79,7 @@ 
    140157 #ifdef CONFIG_X86_LOCAL_APIC 
Note: See TracChangeset for help on using the changeset viewer.