Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3068951 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

[PATCH] revert "timer exit cleanup" 



Revert this June 17 patch: it broke persistence of timers across execve().

Cc: Roland McGrath <roland@redhat.com>
Cc: george anzinger <george@mvista.com>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e8ed11b9

kernel/exit.c

+3 −1
Original line number Diff line number Diff line
@@ -829,8 +829,10 @@ 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)

	if (group_dead) {

 		del_timer_sync(&tsk->signal->real_timer);

		acct_process(code);

	}

	exit_mm(tsk);



	exit_sem(tsk);

kernel/posix-timers.c

+0 −1
Original line number Diff line number Diff line
@@ -1166,7 +1166,6 @@ 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);

}



/*