git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
asm-um
/
ptrace-generic.h
diff --git
a/include/asm-um/ptrace-generic.h
b/include/asm-um/ptrace-generic.h
index
8c472eb
..
99c87c5
100644
(file)
--- a/
include/asm-um/ptrace-generic.h
+++ b/
include/asm-um/ptrace-generic.h
@@
-8,28
+8,14
@@
#ifndef __ASSEMBLY__
#ifndef __ASSEMBLY__
-#include "linux/config.h"
-
-#include "asm/current.h"
-
-#define pt_regs pt_regs_subarch
-#define show_regs show_regs_subarch
-
-#include "asm/arch/ptrace.h"
-
-#undef pt_regs
-#undef show_regs
-#undef user_mode
-#undef instruction_pointer
-
+#include "asm/arch/ptrace-abi.h"
#include "sysdep/ptrace.h"
#include "sysdep/ptrace.h"
-#include "skas_ptrace.h"
struct pt_regs {
union uml_pt_regs regs;
};
struct pt_regs {
union uml_pt_regs regs;
};
-#define EMPTY_REGS {
regs :
EMPTY_UML_PT_REGS }
+#define EMPTY_REGS {
.regs =
EMPTY_UML_PT_REGS }
#define PT_REGS_IP(r) UPT_IP(&(r)->regs)
#define PT_REGS_SP(r) UPT_SP(&(r)->regs)
#define PT_REGS_IP(r) UPT_IP(&(r)->regs)
#define PT_REGS_SP(r) UPT_SP(&(r)->regs)
@@
-58,17
+44,12
@@
extern int set_fpxregs(unsigned long buf, struct task_struct *tsk);
extern void show_regs(struct pt_regs *regs);
extern void show_regs(struct pt_regs *regs);
-#endif
+extern void send_sigtrap(struct task_struct *tsk, union uml_pt_regs *regs,
+ int error_code);
+
+extern int arch_copy_tls(struct task_struct *new);
+extern void clear_flushed_tls(struct task_struct *task);
#endif
#endif
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only. This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */
+#endif