Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 95608261dae863bc43292e6fbd946a3abd3aa49f

Authored by viro@ZenIV.linux.org.uk
Committed by Linus Torvalds
1 parent 8412205838
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

[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: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 5 changed files with 8 additions and 1 deletions Side-by-side Diff

arch/um/include/common-offsets.h
Diff comments   View file @ 9560826
... ... @@ -12,4 +12,5 @@
12 12 DEFINE_STR(UM_KERN_NOTICE, KERN_NOTICE);
13 13 DEFINE_STR(UM_KERN_INFO, KERN_INFO);
14 14 DEFINE_STR(UM_KERN_DEBUG, KERN_DEBUG);
  15 +DEFINE(HOST_ELF_CLASS, ELF_CLASS);
arch/um/os-Linux/Makefile
Diff comments   View file @ 9560826
... ... @@ -9,6 +9,9 @@
9 9 USER_OBJS := aio.o elf_aux.o file.o process.o signal.o start_up.o time.o tt.o \
10 10 tty.o
11 11  
  12 +elf_aux.o: $(ARCH_DIR)/kernel-offsets.h
  13 +CFLAGS_elf_aux.o += -I$(objtree)/arch/um
  14 +
12 15 CFLAGS_user_syms.o += -DSUBARCH_$(SUBARCH)
13 16  
14 17 HAVE_AIO_ABI := $(shell [ -r /usr/include/linux/aio_abi.h ] && \
arch/um/os-Linux/elf_aux.c
Diff comments   View file @ 9560826
... ... @@ -12,8 +12,9 @@
12 12 #include "init.h"
13 13 #include "elf_user.h"
14 14 #include "mem_user.h"
  15 +#include <kernel-offsets.h>
15 16  
16   -#if ELF_CLASS == ELFCLASS32
  17 +#if HOST_ELF_CLASS == ELFCLASS32
17 18 typedef Elf32_auxv_t elf_auxv_t;
18 19 #else
19 20 typedef Elf64_auxv_t elf_auxv_t;
arch/um/sys-i386/kernel-offsets.c
Diff comments   View file @ 9560826
... ... @@ -2,6 +2,7 @@
2 2 #include <linux/stddef.h>
3 3 #include <linux/sched.h>
4 4 #include <linux/time.h>
  5 +#include <linux/elf.h>
5 6 #include <asm/page.h>
6 7  
7 8 #define DEFINE(sym, val) \
arch/um/sys-x86_64/kernel-offsets.c
Diff comments   View file @ 9560826
... ... @@ -2,6 +2,7 @@
2 2 #include <linux/stddef.h>
3 3 #include <linux/sched.h>
4 4 #include <linux/time.h>
  5 +#include <linux/elf.h>
5 6 #include <asm/page.h>
6 7  
7 8 #define DEFINE(sym, val) \