From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 26 Jan 2012 20:45:41 +0000 (-0800)
Subject: Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=2437dcbf555bff04e4ee8b8dba4587f946c1cd3d;p=~shefty%2Frdma-dev.git

Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  rcu: Add missing __cpuinit annotation in rcutorture code
  sched: Add "const" to is_idle_task() parameter
  rcu: Make rcutorture bool parameters really bool (core code)
  memblock: Fix alloc failure due to dumb underflow protection in memblock_find_in_range_node()
---

2437dcbf555bff04e4ee8b8dba4587f946c1cd3d
diff --cc include/linux/sched.h
index 513f5245987,40d84481a1c..2234985a5e6
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@@ -2088,9 -2087,9 +2088,9 @@@ extern int sched_setscheduler_nocheck(s
  extern struct task_struct *idle_task(int cpu);
  /**
   * is_idle_task - is the specified task an idle task?
 - * @tsk: the task in question.
 + * @p: the task in question.
   */
- static inline bool is_idle_task(struct task_struct *p)
+ static inline bool is_idle_task(const struct task_struct *p)
  {
  	return p->pid == 0;
  }