git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
[pandora-kernel.git]
/
kernel
/
compat.c
diff --git
a/kernel/compat.c
b/kernel/compat.c
index
e1ef048
..
4a856a3
100644
(file)
--- a/
kernel/compat.c
+++ b/
kernel/compat.c
@@
-898,7
+898,7
@@
asmlinkage long compat_sys_rt_sigsuspend(compat_sigset_t __user *unewset, compat
current->state = TASK_INTERRUPTIBLE;
schedule();
- set_
thread_flag(TIF_RESTORE_SIGMASK
);
+ set_
restore_sigmask(
);
return -ERESTARTNOHAND;
}
#endif /* __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND */
@@
-1080,4
+1080,3
@@
compat_sys_sysinfo(struct compat_sysinfo __user *info)
return 0;
}
-