kybaaz/linux-xiaomi-chiron
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Browse source
This commit is contained in:
David Woodhouse 2005-06-18 08:36:46 +01:00
commit 0107b3cf32
256 changed files with 4830 additions and 2737 deletions
Download patch file Download diff file Expand all files Collapse all files

4
kernel/exit.c
View file

@ -811,10 +811,8 @@ fastcall NORET_TYPE void do_exit(long code)
acct_update_integrals(tsk);
update_mem_hiwater(tsk);
group_dead = atomic_dec_and_test(&tsk->signal->live);
if (group_dead) {
del_timer_sync(&tsk->signal->real_timer);
if (group_dead)
acct_process(code);
}
exit_mm(tsk);
exit_sem(tsk);

1
kernel/posix-timers.c
View file

@ -1197,6 +1197,7 @@ void exit_itimers(struct signal_struct *sig)
tmr = list_entry(sig->posix_timers.next, struct k_itimer, list);
itimer_delete(tmr);
}
del_timer_sync(&sig->real_timer);
}
/*

7
kernel/sched.c
View file

@ -3755,19 +3755,22 @@ EXPORT_SYMBOL(cond_resched);
*/
int cond_resched_lock(spinlock_t * lock)
{
int ret = 0;
if (need_lockbreak(lock)) {
spin_unlock(lock);
cpu_relax();
ret = 1;
spin_lock(lock);
}
if (need_resched()) {
_raw_spin_unlock(lock);
preempt_enable_no_resched();
__cond_resched();
ret = 1;
spin_lock(lock);
return 1;
}
return 0;
return ret;
}
EXPORT_SYMBOL(cond_resched_lock);