lkml.org 
[lkml]   [2013]   [Jan]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 03/44] Revert some of "binfmt_elf: cleanups"
    Date
    The commit "binfmt_elf: cleanups"
    (f670d0ecda73b7438eec9ed108680bc5f5362ad8) removed an ifndef elf_map but
    this breaks compilation for metag which does define elf_map.

    This adds the ifndef back in as it was before, but does not affect the
    other cleanups made by that patch.

    Signed-off-by: James Hogan <james.hogan@imgtec.com>
    Cc: Alexander Viro <viro@zeniv.linux.org.uk>
    Cc: linux-fsdevel@vger.kernel.org
    Acked-by: Mikael Pettersson <mikpe@it.uu.se>
    ---
    fs/binfmt_elf.c | 4 ++++
    1 files changed, 4 insertions(+), 0 deletions(-)

    diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
    index 9b67173..269f13a 100644
    --- a/fs/binfmt_elf.c
    +++ b/fs/binfmt_elf.c
    @@ -340,6 +340,8 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
    return 0;
    }

    +#ifndef elf_map
    +
    static unsigned long elf_map(struct file *filep, unsigned long addr,
    struct elf_phdr *eppnt, int prot, int type,
    unsigned long total_size)
    @@ -374,6 +376,8 @@ static unsigned long elf_map(struct file *filep, unsigned long addr,
    return(map_addr);
    }

    +#endif /* !elf_map */
    +
    static unsigned long total_mapping_size(struct elf_phdr *cmds, int nr)
    {
    int i, first_idx = -1, last_idx = -1;
    --
    1.7.7.6



    \
     
     \ /
      Last update: 2013-01-10 17:41    [W:4.422 / U:0.280 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site