diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-20 02:11:09 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-20 02:11:09 +0400 |
| commit | d471ce53b1fab60110e4e9f647a345cea31752de (patch) | |
| tree | 73acb87c823b63d026f9ba4617b5e112835d6abf /arch/x86 | |
| parent | 1b050180454dc226780f765a33575d4cd8d6e552 (diff) | |
| parent | 9e82d450531c79b18ab18c9b9645cdd9db31ee98 (diff) | |
| download | linux-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/x86')
| -rw-r--r-- | arch/x86/um/signal.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/um/signal.c b/arch/x86/um/signal.c index ae7319db18ee..5e04a1c899fa 100644 --- a/arch/x86/um/signal.c +++ b/arch/x86/um/signal.c @@ -508,7 +508,6 @@ int setup_signal_stack_si(unsigned long stack_top, int sig, { struct rt_sigframe __user *frame; int err = 0; - struct task_struct *me = current; frame = (struct rt_sigframe __user *) round_down(stack_top - sizeof(struct rt_sigframe), 16); |