diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-12 22:54:16 +0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-12 22:54:16 +0200 |
| commit | 875999c5539999f61a45620aae0c3e5fb1d2b035 (patch) | |
| tree | 4535032a8a10f5782c0aef6a620b1a624ea9f863 /include/asm-um/ptrace-generic.h | |
| parent | Merge branch 'upstream' (diff) | |
| parent | [PATCH] sata_sil24: enable 64bit (diff) | |
| download | linux-875999c5539999f61a45620aae0c3e5fb1d2b035.tar.xz linux-875999c5539999f61a45620aae0c3e5fb1d2b035.zip | |
Merge branch 'upstream'
Diffstat (limited to 'include/asm-um/ptrace-generic.h')
| -rw-r--r-- | include/asm-um/ptrace-generic.h | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/include/asm-um/ptrace-generic.h b/include/asm-um/ptrace-generic.h index 46599ac44037..503484305e67 100644 --- a/include/asm-um/ptrace-generic.h +++ b/include/asm-um/ptrace-generic.h @@ -28,7 +28,7 @@ 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) @@ -60,17 +60,9 @@ extern void show_regs(struct pt_regs *regs); extern void send_sigtrap(struct task_struct *tsk, union uml_pt_regs *regs, int error_code); -#endif +extern int arch_copy_tls(struct task_struct *new); +extern void clear_flushed_tls(struct task_struct *task); #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 |