Merge commit 'v2.6.36' into wip-merge-2.6.36

Conflicts:
	Makefile
	arch/x86/include/asm/unistd_32.h
	arch/x86/kernel/syscall_table_32.S
	kernel/sched.c
	kernel/time/tick-sched.c

Relevant API and functions changes (solved in this commit):
- (API) .enqueue_task() (enqueue_task_litmus),
  dequeue_task() (dequeue_task_litmus),
  [litmus/sched_litmus.c]
- (API) .select_task_rq() (select_task_rq_litmus)
  [litmus/sched_litmus.c]
- (API) sysrq_dump_trace_buffer() and sysrq_handle_kill_rt_tasks()
  [litmus/sched_trace.c]
- struct kfifo internal buffer name changed (buffer -> buf)
  [litmus/sched_trace.c]
- add_wait_queue_exclusive_locked -> __add_wait_queue_tail_exclusive
  [litmus/fmlp.c]
- syscall numbers for both x86_32 and x86_64

1 files changed, 3 insertions, 24 deletions

diff --git a/kernel/sched_stats.h b/kernel/sched_stats.h
index 32d2bd4061b0..25c2f962f6fc 100644
--- a/kernel/sched_stats.h
+++ b/kernel/sched_stats.h
@@ -295,13 +295,7 @@ sched_info_switch(struct task_struct *prev, struct task_struct *next)
 static inline void account_group_user_time(struct task_struct *tsk,
                                            cputime_t cputime)
 {
-        struct thread_group_cputimer *cputimer;
-
-        /* tsk == current, ensure it is safe to use ->signal */
-        if (unlikely(tsk->exit_state))
-                return;
-
-        cputimer = &tsk->signal->cputimer;
+        struct thread_group_cputimer *cputimer = &tsk->signal->cputimer;
 
         if (!cputimer->running)
                 return;
@@ -325,13 +319,7 @@ static inline void account_group_user_time(struct task_struct *tsk,
 static inline void account_group_system_time(struct task_struct *tsk,
                                              cputime_t cputime)
 {
-        struct thread_group_cputimer *cputimer;
-
-        /* tsk == current, ensure it is safe to use ->signal */
-        if (unlikely(tsk->exit_state))
-                return;
-
-        cputimer = &tsk->signal->cputimer;
+        struct thread_group_cputimer *cputimer = &tsk->signal->cputimer;
 
         if (!cputimer->running)
                 return;
@@ -355,16 +343,7 @@ static inline void account_group_system_time(struct task_struct *tsk,
 static inline void account_group_exec_runtime(struct task_struct *tsk,
                                               unsigned long long ns)
 {
-        struct thread_group_cputimer *cputimer;
-        struct signal_struct *sig;
-
-        sig = tsk->signal;
-        /* see __exit_signal()->task_rq_unlock_wait() */
-        barrier();
-        if (unlikely(!sig))
-                return;
-
-        cputimer = &sig->cputimer;
+        struct thread_group_cputimer *cputimer = &tsk->signal->cputimer;
 
         if (!cputimer->running)
                 return;