diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-08-15 18:55:58 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-08-15 18:56:13 +0200 |
| commit | fa08661af834875c9bd6f7f0b1b9388dc72a6585 (patch) | |
| tree | c381fcfcfeb38515bfa93445c80ad9231343414d /init | |
| parent | 240ebbf81f149b11a31e060ebe5ee51a3c775360 (diff) | |
| parent | 64f1607ffbbc772685733ea63e6f7f4183df1b16 (diff) | |
Merge commit 'v2.6.31-rc6' into core/rcu
Merge reason: the branch was on pre-rc1 .30, update to latest.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 13 | ||||
| -rw-r--r-- | init/main.c | 6 |
2 files changed, 12 insertions, 7 deletions
diff --git a/init/Kconfig b/init/Kconfig index d10f31dfa0b..25373cf3267 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -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 diff --git a/init/main.c b/init/main.c index 4870dfeb9ee..2c5ade79eb8 100644 --- a/init/main.c +++ b/init/main.c @@ -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 |