Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 9178
b: refs/heads/master
c: 41c79dc
h: refs/heads/master
v: v3
  • Loading branch information
Paolo 'Blaisorblade' Giarrusso authored and Linus Torvalds committed Sep 21, 2005
1 parent 75e9d29 commit ce4121c
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: fd7481047882eaa0a692a545d5f8419612ece1b0
refs/heads/master: 41c79dc3825545d9aa2d5e5b1a99f8faabf51455
4 changes: 3 additions & 1 deletion trunk/arch/um/include/common-offsets.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
3 changes: 2 additions & 1 deletion trunk/arch/um/os-Linux/elf_aux.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit ce4121c

Please sign in to comment.