diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-15 20:43:03 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-15 20:43:03 +0100 |
| commit | 72b623c73685e86b70a51855e1058ebc98a9f6ed (patch) | |
| tree | ce0942ca907ad09480358076fd2724f8c1d10547 /arch/x86 | |
| parent | 9abd60304816a5b0fd9e51034f78e3eaed89f901 (diff) | |
| parent | b5f9fd0f8a05c9bafb91a9a85b9110938d8e585b (diff) | |
| download | blackbird-op-linux-72b623c73685e86b70a51855e1058ebc98a9f6ed.tar.gz blackbird-op-linux-72b623c73685e86b70a51855e1058ebc98a9f6ed.zip | |
Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/power-tracer
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 2 | ||||
| -rw-r--r-- | arch/x86/kernel/process.c | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c index 7ed925edf4d2..c5d737cdb365 100644 --- a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c +++ b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c @@ -70,6 +70,8 @@ struct acpi_cpufreq_data { static DEFINE_PER_CPU(struct acpi_cpufreq_data *, drv_data); +DEFINE_TRACE(power_mark); + /* acpi_perf_data is a pointer to percpu data. */ static struct acpi_processor_performance *acpi_perf_data; diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c index 51126b7c0923..23b328edc2b3 100644 --- a/arch/x86/kernel/process.c +++ b/arch/x86/kernel/process.c @@ -19,6 +19,9 @@ EXPORT_SYMBOL(idle_nomwait); struct kmem_cache *task_xstate_cachep; +DEFINE_TRACE(power_start); +DEFINE_TRACE(power_end); + int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src) { *dst = *src; |
