A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-29 19:21:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge commit 'v2.6.31-rc6' into core/rcu

Browse source 
Merge reason: the branch was on pre-rc1 .30, update to latest.

Signed-off-by: Ingo Molnar <[email protected]>
This commit is contained in:
Ingo Molnar 2009-08-15 18:55:58 +02:00
commit fa08661af8
2538 changed files with 70259 additions and 36388 deletions
Download patch file Download diff file Expand all files Collapse all files

13
init/Kconfig
View file

@ -932,6 +932,7 @@ menu "Performance Counters"
config PERF_COUNTERS
bool "Kernel Performance Counters"
default y if PROFILING
depends on HAVE_PERF_COUNTERS
select ANON_INODES
help
@ -953,9 +954,17 @@ config PERF_COUNTERS
Say Y if unsure.
config EVENT_PROFILE
bool "Tracepoint profile sources"
depends on PERF_COUNTERS && EVENT_TRACER
bool "Tracepoint profiling sources"
depends on PERF_COUNTERS && EVENT_TRACING
default y
help
Allow the use of tracepoints as software performance counters.
When this is enabled, you can create perf counters based on
tracepoints using PERF_TYPE_TRACEPOINT and the tracepoint ID
found in debugfs://tracing/events/*/*/id. (The -e/--events
option to the perf tool can parse and interpret symbolic
tracepoints, in the subsystem:tracepoint_name format.)
endmenu

6
init/main.c
View file

@ -24,6 +24,7 @@
#include <linux/smp_lock.h>
#include <linux/initrd.h>
#include <linux/bootmem.h>
#include <linux/acpi.h>
#include <linux/tty.h>
#include <linux/gfp.h>
#include <linux/percpu.h>
@ -88,11 +89,6 @@ extern void sbus_init(void);
extern void prio_tree_init(void);
extern void radix_tree_init(void);
extern void free_initmem(void);
#ifdef CONFIG_ACPI
extern void acpi_early_init(void);
#else
static inline void acpi_early_init(void) { }
#endif
#ifndef CONFIG_DEBUG_RODATA
static inline void mark_rodata_ro(void) { }
#endif