lkml.org 
[lkml]   [2010]   [Mar]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[002/156] decompress: fix new decompressor for PIC
    2.6.33-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Russell King <rmk@arm.linux.org.uk>

    commit 5ceaa2f39bfa73c4398cd01e78f1c3ebde3d3383 upstream.

    The ARM kernel decompressor wants to be able to relocate r/w data
    independently from the rest of the image, and we do this by ensuring that
    r/w data has global visibility. Define STATIC_RW_DATA to be empty to
    achieve this.

    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
    Cc: Alain Knaff <alain@knaff.lu>
    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>

    --- a/include/linux/decompress/mm.h
    +++ b/include/linux/decompress/mm.h
    @@ -14,11 +14,21 @@

    /* Code active when included from pre-boot environment: */

    +/*
    + * Some architectures want to ensure there is no local data in their
    + * pre-boot environment, so that data can arbitarily relocated (via
    + * GOT references). This is achieved by defining STATIC_RW_DATA to
    + * be null.
    + */
    +#ifndef STATIC_RW_DATA
    +#define STATIC_RW_DATA static
    +#endif
    +
    /* A trivial malloc implementation, adapted from
    * malloc by Hannu Savolainen 1993 and Matthias Urlichs 1994
    */
    -static unsigned long malloc_ptr;
    -static int malloc_count;
    +STATIC_RW_DATA unsigned long malloc_ptr;
    +STATIC_RW_DATA int malloc_count;

    static void *malloc(int size)
    {



    \
     
     \ /
      Last update: 2010-03-31 01:59    [W:11.074 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site