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

4 files changed, 11 insertions, 9 deletions

diff --git a/litmus/fmlp.c b/litmus/fmlp.c
index 03fa7358d5eb..a9a638576d69 100644
--- a/litmus/fmlp.c
+++ b/litmus/fmlp.c
@@ -148,7 +148,7 @@ static int do_fmlp_down(struct pi_semaphore* sem)
             waitqueue_active(&sem->wait)) {
                 /* we need to suspend */
                 tsk->state = TASK_UNINTERRUPTIBLE;
-                add_wait_queue_exclusive_locked(&sem->wait, &wait);
+                __add_wait_queue_tail_exclusive(&sem->wait, &wait);
 
                 TRACE_CUR("suspends on PI lock %p\n", sem);
                 litmus->pi_block(sem, tsk);
diff --git a/litmus/litmus.c b/litmus/litmus.c
index b04a42b0da9c..e854ba317762 100644
--- a/litmus/litmus.c
+++ b/litmus/litmus.c
@@ -488,7 +488,7 @@ void exit_litmus(struct task_struct *dead_tsk)
 #ifdef CONFIG_MAGIC_SYSRQ
 int sys_kill(int pid, int sig);
 
-static void sysrq_handle_kill_rt_tasks(int key, struct tty_struct *tty)
+static void sysrq_handle_kill_rt_tasks(int key)
 {
         struct task_struct *t;
         read_lock(&tasklist_lock);
diff --git a/litmus/sched_litmus.c b/litmus/sched_litmus.c
index 3ed713b8791b..65873152e68f 100644
--- a/litmus/sched_litmus.c
+++ b/litmus/sched_litmus.c
@@ -154,9 +154,9 @@ litmus_schedule(struct rq *rq, struct task_struct *prev)
 }
 
 static void enqueue_task_litmus(struct rq *rq, struct task_struct *p,
-                                int wakeup, bool head)
+                                int flags)
 {
-        if (wakeup) {
+        if (flags & ENQUEUE_WAKEUP) {
                 sched_trace_task_resume(p);
                 tsk_rt(p)->present = 1;
                 /* LITMUS^RT plugins need to update the state
@@ -176,9 +176,10 @@ static void enqueue_task_litmus(struct rq *rq, struct task_struct *p,
                 TRACE_TASK(p, "ignoring an enqueue, not a wake up.\n");
 }
 
-static void dequeue_task_litmus(struct rq *rq, struct task_struct *p, int sleep)
+static void dequeue_task_litmus(struct rq *rq, struct task_struct *p,
+                                int flags)
 {
-        if (sleep) {
+        if (flags & DEQUEUE_SLEEP) {
                 litmus->task_block(p);
                 tsk_rt(p)->present = 0;
                 sched_trace_task_block(p);
@@ -279,7 +280,8 @@ static void set_curr_task_litmus(struct rq *rq)
  * We don't care about the scheduling domain; can gets called from
  * exec, fork, wakeup.
  */
-static int select_task_rq_litmus(struct task_struct *p, int sd_flag, int flags)
+static int select_task_rq_litmus(struct rq *rq, struct task_struct *p,
+                int sd_flag, int flags)
 {
         /* preemption is already disabled.
          * We don't want to change cpu here
diff --git a/litmus/sched_trace.c b/litmus/sched_trace.c
index 1fa2094b0495..8051b51a2022 100644
--- a/litmus/sched_trace.c
+++ b/litmus/sched_trace.c
@@ -266,7 +266,7 @@ static int log_open(struct inode *in, struct file *filp)
 
         printk(KERN_DEBUG
                "sched_trace kfifo with buffer starting at: 0x%p\n",
-               (tbuf->buf.kfifo).buffer);
+               (tbuf->buf.kfifo).buf);
 
         /* override printk() */
         trace_override++;
@@ -340,7 +340,7 @@ void dump_trace_buffer(int max)
         trace_recurse = 0;
 }
 
-static void sysrq_dump_trace_buffer(int key, struct tty_struct *tty)
+static void sysrq_dump_trace_buffer(int key)
 {
         dump_trace_buffer(100);
 }