Merge branch 'rcu/fixes-for-v3.2' into rcu/urgent

Merge reason: Add these commits so that fixes on this branch do not
	conflict with already-mainlined code.

Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>

diff --combined kernel/events/core.c
index 58690af323e469213db42bce2c0d1a772db12519,923c6b5667dbe57901d9b7cc2f7d64e97c846c41..fc0e7ff11dda29dc4ece2f01cfae46da98beb448
--- 1/kernel/events/core.c
--- 2/kernel/events/core.c
+++ b/kernel/events/core.c
@@@ -3558,13 -3558,9 +3558,13 @@@ static void ring_buffer_wakeup(struct p
  
        rcu_read_lock();
        rb = rcu_dereference(event->rb);
 -      list_for_each_entry_rcu(event, &rb->event_list, rb_entry) {
 +      if (!rb)
 +              goto unlock;
 +
 +      list_for_each_entry_rcu(event, &rb->event_list, rb_entry)
                wake_up_all(&event->waitq);
 -      }
 +
 +unlock:
        rcu_read_unlock();
  }
  
@@@ -5366,7 -5362,7 +5366,7 @@@ static enum hrtimer_restart perf_sweven
        regs = get_irq_regs();
  
        if (regs && !perf_exclude_event(event, regs)) {
-               if (!(event->attr.exclude_idle && current->pid == 0))
+               if (!(event->attr.exclude_idle && is_idle_task(current)))
                        if (perf_event_overflow(event, &data, regs))
                                ret = HRTIMER_NORESTART;
        }