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

* '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()

diff --cc include/linux/sched.h
index 513f524,40d8448..2234985
--- 1/include/linux/sched.h
--- 2/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;
  }