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

Commit 95608261 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] bogus symbol used in arch/um/os-Linux/elf_aux.c 



elf_aux is userland code; it uses symbol (ELF_CLASS) that doesn't exist in
userland headers; pulled into kernel-offsets.h, switched elf_aux to using it.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 84122058

arch/um/include/common-offsets.h

+1 −0
Original line number Diff line number Diff line
@@ -12,3 +12,4 @@ 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);

arch/um/os-Linux/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -9,6 +9,9 @@ obj-y = aio.o elf_aux.o file.o process.o signal.o start_up.o time.o tt.o \ 
USER_OBJS := aio.o elf_aux.o file.o process.o signal.o start_up.o time.o tt.o \

	tty.o



elf_aux.o: $(ARCH_DIR)/kernel-offsets.h

CFLAGS_elf_aux.o += -I$(objtree)/arch/um



CFLAGS_user_syms.o += -DSUBARCH_$(SUBARCH)



HAVE_AIO_ABI := $(shell [ -r /usr/include/linux/aio_abi.h ] && \

arch/um/os-Linux/elf_aux.c

+2 −1
Original line number Diff line number Diff line
@@ -12,8 +12,9 @@ 
#include "init.h"

#include "elf_user.h"

#include "mem_user.h"

#include <kernel-offsets.h>



#if ELF_CLASS == ELFCLASS32

#if HOST_ELF_CLASS == ELFCLASS32

typedef Elf32_auxv_t elf_auxv_t;

#else

typedef Elf64_auxv_t elf_auxv_t;

arch/um/sys-i386/kernel-offsets.c

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#include <linux/stddef.h>

#include <linux/sched.h>

#include <linux/time.h>

#include <linux/elf.h>

#include <asm/page.h>



#define DEFINE(sym, val) \

arch/um/sys-x86_64/kernel-offsets.c

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#include <linux/stddef.h>

#include <linux/sched.h>

#include <linux/time.h>

#include <linux/elf.h>

#include <asm/page.h>



#define DEFINE(sym, val) \