lkml.org 
[lkml]   [2008]   [Jul]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 21/62] markers: fix duplicate modpost entry
    2.6.26 -stable review patch.  If anyone has any objections, please let
    us know.

    ------------------
    From: Mathieu Desnoyers <compudj@krystal.dyndns.org>

    commit: d35cb360c29956510b2fe1a953bd4968536f7216

    When a kernel was rebuilt, the previous Module.markers was not cleared.
    It caused markers with different format strings to appear as duplicates
    when a markers was changed. This problem is present since
    scripts/mod/modpost.c started to generate Module.markers, commit
    b2e3e658b344c6bcfb8fb694100ab2f2b5b2edb0

    It therefore applies to 2.6.25, 2.6.26 and linux-next.

    I merely merged the patches from Roland, Wenji and Takashi here.

    Credits to
    Roland McGrath <roland@redhat.com>
    Wenji Huang <wenji.huang@oracle.com>
    and
    Takashi Nishiie <t-nishiie@np.css.fujitsu.com>

    for providing the individual fixes.

    - Changelog :
    - Integrated Takashi's Makefile modification to clear Module.markers upon
    make clean.

    Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
    Cc: Roland McGrath <roland@redhat.com>
    Cc: Wenji Huang <wenji.huang@oracle.com>
    Cc: Takashi Nishiie <t-nishiie@np.css.fujitsu.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    Makefile | 3 ++-
    scripts/Makefile.modpost | 1 +
    scripts/mod/modpost.c | 3 ++-
    3 files changed, 5 insertions(+), 2 deletions(-)

    --- a/Makefile
    +++ b/Makefile
    @@ -1133,7 +1133,8 @@ clean: archclean $(clean-dirs)
    @find . $(RCS_FIND_IGNORE) \
    \( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \
    -o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \
    - -o -name '*.symtypes' -o -name 'modules.order' \) \
    + -o -name '*.symtypes' -o -name 'modules.order' \
    + -o -name 'Module.markers' \) \
    -type f -print | xargs rm -f

    # mrproper - Delete all generated files, including .config
    --- a/scripts/Makefile.modpost
    +++ b/scripts/Makefile.modpost
    @@ -101,6 +101,7 @@ quiet_cmd_kernel-mod = MODPOST $@
    cmd_kernel-mod = $(modpost) $@

    vmlinux.o: FORCE
    + @rm -fr $(kernelmarkersfile)
    $(call cmd,kernel-mod)

    # Declare generated files as targets for modpost
    --- a/scripts/mod/modpost.c
    +++ b/scripts/mod/modpost.c
    @@ -1992,7 +1992,8 @@ static void read_markers(const char *fna
    mod->skip = 1;
    }

    - add_marker(mod, marker, fmt);
    + if (!mod->skip)
    + add_marker(mod, marker, fmt);
    }
    return;
    fail:
    --


    \
     
     \ /
      Last update: 2008-07-31 02:15    [W:0.024 / U:0.272 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site