leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
viro@ZenIV.linux.org.uk 2005-09-06 22:33:51 +01:00 committed by Linus Torvalds
parent 8412205838
commit 95608261da
5 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/um/include/common-offsets.h
View File

@ -12,3 +12,4 @@ DEFINE_STR(UM_KERN_WARNING, KERN_WARNING);
DEFINE_STR(UM_KERN_NOTICE, KERN_NOTICE); DEFINE_STR(UM_KERN_NOTICE, KERN_NOTICE);
DEFINE_STR(UM_KERN_INFO, KERN_INFO); DEFINE_STR(UM_KERN_INFO, KERN_INFO);
DEFINE_STR(UM_KERN_DEBUG, KERN_DEBUG); DEFINE_STR(UM_KERN_DEBUG, KERN_DEBUG);
DEFINE(HOST_ELF_CLASS, ELF_CLASS);

3
arch/um/os-Linux/Makefile
View File

@ -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 \ USER_OBJS := aio.o elf_aux.o file.o process.o signal.o start_up.o time.o tt.o \
tty.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) CFLAGS_user_syms.o += -DSUBARCH_$(SUBARCH)
HAVE_AIO_ABI := $(shell [ -r /usr/include/linux/aio_abi.h ] && \ HAVE_AIO_ABI := $(shell [ -r /usr/include/linux/aio_abi.h ] && \

3
arch/um/os-Linux/elf_aux.c
View File

@ -12,8 +12,9 @@
#include "init.h" #include "init.h"
#include "elf_user.h" #include "elf_user.h"
#include "mem_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; typedef Elf32_auxv_t elf_auxv_t;
#else #else
typedef Elf64_auxv_t elf_auxv_t; typedef Elf64_auxv_t elf_auxv_t;

1
arch/um/sys-i386/kernel-offsets.c
View File

@ -2,6 +2,7 @@
#include <linux/stddef.h> #include <linux/stddef.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/time.h> #include <linux/time.h>
#include <linux/elf.h>
#include <asm/page.h> #include <asm/page.h>
#define DEFINE(sym, val) \ #define DEFINE(sym, val) \

1
arch/um/sys-x86_64/kernel-offsets.c
View File

@ -2,6 +2,7 @@
#include <linux/stddef.h> #include <linux/stddef.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/time.h> #include <linux/time.h>
#include <linux/elf.h>
#include <asm/page.h> #include <asm/page.h>
#define DEFINE(sym, val) \ #define DEFINE(sym, val) \