diff options
| author | Jeff Dike <jdike@addtoit.com> | 2005-05-20 16:59:07 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-20 18:48:17 -0400 |
| commit | ba9950c820e556e39cd26581826b5581a64fb641 (patch) | |
| tree | 4ba37ce6b1852e95619ad3e6bd97a2032dd4c1fc /include/asm-um/elf-i386.h | |
| parent | 46f4e1b7d5fa3ddf2486bf69716c404147e38ebf (diff) | |
[PATCH] uml: small fixes left over from rc4
Some changes that I sent in didn't make 2.6.12-rc4 for some reason. This
adds them back. We have
an x86_64 definition of TOP_ADDR
a reimplementation of the x86_64 csum_partial_copy_from_user
some syntax fixes in arch/um/kernel/ptrace.c
removal of a CFLAGS definition in the x86_64 Makefile
some include changes in the x86_64 ptrace.c and user-offsets.h
a syntax fix in elf-x86_64.h
Also moved an include in the i386 and x86_64 Makefiles to make the symlinks
work, and some small fixes from Al Viro.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-um/elf-i386.h')
| -rw-r--r-- | include/asm-um/elf-i386.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-um/elf-i386.h b/include/asm-um/elf-i386.h index b72e23519e00..9bab712dc5c0 100644 --- a/include/asm-um/elf-i386.h +++ b/include/asm-um/elf-i386.h | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | #ifndef __UM_ELF_I386_H | 5 | #ifndef __UM_ELF_I386_H |
| 6 | #define __UM_ELF_I386_H | 6 | #define __UM_ELF_I386_H |
| 7 | 7 | ||
| 8 | #include "user.h" | 8 | #include <asm/user.h> |
| 9 | 9 | ||
| 10 | #define R_386_NONE 0 | 10 | #define R_386_NONE 0 |
| 11 | #define R_386_32 1 | 11 | #define R_386_32 1 |