From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 11 Jun 2009 21:01:07 +0000 (-0700)
Subject: Merge branch 'perfcounters-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v2.6.31-rc1~383
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=8a1ca8cedd108c8e76a6ab34079d0bbb4f244799

Merge branch 'perfcounters-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'perfcounters-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (574 commits)
  perf_counter: Turn off by default
  perf_counter: Add counter->id to the throttle event
  perf_counter: Better align code
  perf_counter: Rename L2 to LL cache
  perf_counter: Standardize event names
  perf_counter: Rename enums
  perf_counter tools: Clean up u64 usage
  perf_counter: Rename perf_counter_limit sysctl
  perf_counter: More paranoia settings
  perf_counter: powerpc: Implement generalized cache events for POWER processors
  perf_counters: powerpc: Add support for POWER7 processors
  perf_counter: Accurate period data
  perf_counter: Introduce struct for sample data
  perf_counter tools: Normalize data using per sample period data
  perf_counter: Annotate exit ctx recursion
  perf_counter tools: Propagate signals properly
  perf_counter tools: Small frequency related fixes
  perf_counter: More aggressive frequency adjustment
  perf_counter/x86: Fix the model number of Intel Core2 processors
  perf_counter, x86: Correct some event and umask values for Intel processors
  ...
---

8a1ca8cedd108c8e76a6ab34079d0bbb4f244799
diff --cc kernel/sched.c
index dcf2dc28931a,5b3f6ec1b0b3..f04aa9664504
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@@ -9310,15 -9357,17 +9353,17 @@@ void __init sched_init(void
  	current->sched_class = &fair_sched_class;
  
  	/* Allocate the nohz_cpu_mask if CONFIG_CPUMASK_OFFSTACK */
 -	alloc_bootmem_cpumask_var(&nohz_cpu_mask);
 +	alloc_cpumask_var(&nohz_cpu_mask, GFP_NOWAIT);
  #ifdef CONFIG_SMP
  #ifdef CONFIG_NO_HZ
 -	alloc_bootmem_cpumask_var(&nohz.cpu_mask);
 -	alloc_bootmem_cpumask_var(&nohz.ilb_grp_nohz_mask);
 +	alloc_cpumask_var(&nohz.cpu_mask, GFP_NOWAIT);
 +	alloc_cpumask_var(&nohz.ilb_grp_nohz_mask, GFP_NOWAIT);
  #endif
 -	alloc_bootmem_cpumask_var(&cpu_isolated_map);
 +	alloc_cpumask_var(&cpu_isolated_map, GFP_NOWAIT);
  #endif /* SMP */
  
+ 	perf_counter_init();
+ 
  	scheduler_running = 1;
  }