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-3.1' of git://linux-nfs.org/~bfields/linux
[pandora-kernel.git]
/
kernel
/
exit.c
diff --git
a/kernel/exit.c
b/kernel/exit.c
index
73bb192
..
9ee58bb
100644
(file)
--- a/
kernel/exit.c
+++ b/
kernel/exit.c
@@
-85,7
+85,6
@@
static void __exit_signal(struct task_struct *tsk)
struct tty_struct *uninitialized_var(tty);
sighand = rcu_dereference_check(tsk->sighand,
struct tty_struct *uninitialized_var(tty);
sighand = rcu_dereference_check(tsk->sighand,
- rcu_read_lock_held() ||
lockdep_tasklist_lock_is_held());
spin_lock(&sighand->siglock);
lockdep_tasklist_lock_is_held());
spin_lock(&sighand->siglock);
@@
-898,7
+897,6
@@
NORET_TYPE void do_exit(long code)
profile_task_exit(tsk);
profile_task_exit(tsk);
- WARN_ON(atomic_read(&tsk->fs_excl));
WARN_ON(blk_needs_flush_plug(tsk));
if (unlikely(in_interrupt()))
WARN_ON(blk_needs_flush_plug(tsk));
if (unlikely(in_interrupt()))