projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
529a4f4
)
uml: remove include of asm/user.h
author
Jeff Dike
<
[email protected]
>
Thu, 12 Jun 2008 22:21:40 +0000
(15:21 -0700)
committer
Linus Torvalds
<
[email protected]
>
Fri, 13 Jun 2008 01:05:40 +0000
(18:05 -0700)
I allowed an include of asm/user.h to sneak back in. This patch replaces
it with sys/user.h.
Signed-off-by: Jeff Dike <
[email protected]
>
Signed-off-by: Andrew Morton <
[email protected]
>
Signed-off-by: Linus Torvalds <
[email protected]
>
arch/um/os-Linux/sys-i386/registers.c
patch
|
blob
|
history
diff --git
a/arch/um/os-Linux/sys-i386/registers.c
b/arch/um/os-Linux/sys-i386/registers.c
index b487cbead1bd396e02dabdeb92f10118bf2e75b4..229f7a53d8dad95279798105eaa28fc81daa53e9 100644
(file)
--- a/
arch/um/os-Linux/sys-i386/registers.c
+++ b/
arch/um/os-Linux/sys-i386/registers.c
@@
-6,7
+6,7
@@
#include <errno.h>
#include <sys/ptrace.h>
-#include <
asm
/user.h>
+#include <
sys
/user.h>
#include "kern_constants.h"
#include "longjmp.h"
#include "user.h"
@@
-76,7
+76,7
@@
int put_fp_registers(int pid, unsigned long *regs)
void arch_init_registers(int pid)
{
- struct user_f
xsr
_struct fpx_regs;
+ struct user_f
pxregs
_struct fpx_regs;
int err;
err = ptrace(PTRACE_GETFPXREGS, pid, 0, &fpx_regs);