diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
| commit | da733563be5a9da26fe81d9f007262d00b846e22 (patch) | |
| tree | db28291df94a2043af2123911984c5c173da4e6f /arch/um/include/shared/kern_util.h | |
| parent | 6ccbcf2cb41131f8d56ef0723bf3f7c1f8486076 (diff) | |
| parent | dab78d7924598ea4031663dd10db814e2e324928 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'arch/um/include/shared/kern_util.h')
| -rw-r--r-- | arch/um/include/shared/kern_util.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/um/include/shared/kern_util.h b/arch/um/include/shared/kern_util.h index 3c341222d252..0f1483852460 100644 --- a/arch/um/include/shared/kern_util.h +++ b/arch/um/include/shared/kern_util.h | |||
| @@ -21,7 +21,6 @@ extern unsigned long alloc_stack(int order, int atomic); | |||
| 21 | extern void free_stack(unsigned long stack, int order); | 21 | extern void free_stack(unsigned long stack, int order); |
| 22 | 22 | ||
| 23 | extern int do_signal(void); | 23 | extern int do_signal(void); |
| 24 | extern void copy_sc(struct uml_pt_regs *regs, void *from); | ||
| 25 | extern void interrupt_end(void); | 24 | extern void interrupt_end(void); |
| 26 | extern void relay_signal(int sig, struct uml_pt_regs *regs); | 25 | extern void relay_signal(int sig, struct uml_pt_regs *regs); |
| 27 | 26 | ||