diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-19 22:11:09 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-19 22:11:09 (GMT) |
| commit | d471ce53b1fab60110e4e9f647a345cea31752de (patch) | |
| tree | 73acb87c823b63d026f9ba4617b5e112835d6abf /arch/um/include/shared/frame_kern.h | |
| parent | 1b050180454dc226780f765a33575d4cd8d6e552 (diff) | |
| parent | 9e82d450531c79b18ab18c9b9645cdd9db31ee98 (diff) | |
| download | linux-fsl-qoriq-d471ce53b1fab60110e4e9f647a345cea31752de.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
Pull UML fixes from Richard Weinberger:
"Special thanks goes to Toralf Föster for continuously testing UML and
reporting issues!"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
um: remove dead code
um: siginfo cleanup
uml: Fix which_tmpdir failure when /dev/shm is a symlink, and in other edge cases
um: Fix wait_stub_done() error handling
um: Mark stub pages mapping with VM_PFNMAP
um: Fix return value of strnlen_user()
Diffstat (limited to 'arch/um/include/shared/frame_kern.h')
| -rw-r--r-- | arch/um/include/shared/frame_kern.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/um/include/shared/frame_kern.h b/arch/um/include/shared/frame_kern.h index e584e40..f2ca570 100644 --- a/arch/um/include/shared/frame_kern.h +++ b/arch/um/include/shared/frame_kern.h @@ -6,13 +6,13 @@ #ifndef __FRAME_KERN_H_ #define __FRAME_KERN_H_ -extern int setup_signal_stack_sc(unsigned long stack_top, int sig, +extern int setup_signal_stack_sc(unsigned long stack_top, int sig, struct k_sigaction *ka, - struct pt_regs *regs, + struct pt_regs *regs, sigset_t *mask); -extern int setup_signal_stack_si(unsigned long stack_top, int sig, +extern int setup_signal_stack_si(unsigned long stack_top, int sig, struct k_sigaction *ka, - struct pt_regs *regs, siginfo_t *info, + struct pt_regs *regs, struct siginfo *info, sigset_t *mask); #endif |