Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41c79dc3 authored by Paolo 'Blaisorblade' Giarrusso's avatar Paolo 'Blaisorblade' Giarrusso Committed by Linus Torvalds
Browse files

[PATCH] uml: fix bogus HOST_ELF_CLASS symbol name 



Even if with a bit of misunderstanding, Al fixed this in commit
95608261.

Well, the symbol was intended to come from userspace (it exists there on normal
host), but since some hosts may miss that, using the kernel one is just as fine.
However, rename it to be named consistently with the rest.

Actually, he missed converting ELFCLASS32 to coming from kernel headers. For
consistence, add ELFCLASS64 too.

Cc: Al Viro <viro@ZenIV.linux.org.uk>
Signed-off-by: default avatarPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent fd748104

arch/um/include/common-offsets.h

+3 −1
Original line number Diff line number Diff line
@@ -12,4 +12,6 @@ DEFINE_STR(UM_KERN_WARNING, KERN_WARNING); 
DEFINE_STR(UM_KERN_NOTICE, KERN_NOTICE);

DEFINE_STR(UM_KERN_INFO, KERN_INFO);

DEFINE_STR(UM_KERN_DEBUG, KERN_DEBUG);

DEFINE(HOST_ELF_CLASS, ELF_CLASS);
 
DEFINE(UM_ELF_CLASS, ELF_CLASS);

DEFINE(UM_ELFCLASS32, ELFCLASS32);

DEFINE(UM_ELFCLASS64, ELFCLASS64);

arch/um/os-Linux/elf_aux.c

+2 −1
Original line number Diff line number Diff line
@@ -14,7 +14,8 @@ 
#include "mem_user.h"

#include <kernel-offsets.h>



#if HOST_ELF_CLASS == ELFCLASS32

/* Use the one from the kernel - the host may miss it, if having old headers. */

#if UM_ELF_CLASS == UM_ELFCLASS32

typedef Elf32_auxv_t elf_auxv_t;

#else

typedef Elf64_auxv_t elf_auxv_t;