Merge branch 'perfcounters-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
Linus Torvalds [Thu, 11 Jun 2009 21:01:07 +0000 (14:01 -0700)]
* '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
  ...

1  2 
MAINTAINERS
fs/exec.c
include/linux/init_task.h
include/linux/sched.h
kernel/exit.c
kernel/sched.c
kernel/sysctl.c
mm/mmap.c

diff --cc MAINTAINERS
Simple merge
diff --cc fs/exec.c
Simple merge
Simple merge
Simple merge
diff --cc kernel/exit.c
Simple merge
diff --cc 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;
  }
  
diff --cc kernel/sysctl.c
Simple merge
diff --cc mm/mmap.c
Simple merge