git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
process_32.c
diff --git
a/arch/x86/kernel/process_32.c
b/arch/x86/kernel/process_32.c
index
4b9befa
..
8d12878
100644
(file)
--- a/
arch/x86/kernel/process_32.c
+++ b/
arch/x86/kernel/process_32.c
@@
-57,8
+57,6
@@
#include <asm/syscalls.h>
#include <asm/debugreg.h>
#include <asm/syscalls.h>
#include <asm/debugreg.h>
-#include <trace/events/power.h>
-
asmlinkage void ret_from_fork(void) __asm__("ret_from_fork");
/*
asmlinkage void ret_from_fork(void) __asm__("ret_from_fork");
/*
@@
-113,8
+111,6
@@
void cpu_idle(void)
stop_critical_timings();
pm_idle();
start_critical_timings();
stop_critical_timings();
pm_idle();
start_critical_timings();
- trace_power_end(smp_processor_id());
- trace_cpu_idle(PWR_EVENT_EXIT, smp_processor_id());
}
tick_nohz_restart_sched_tick();
preempt_enable_no_resched();
}
tick_nohz_restart_sched_tick();
preempt_enable_no_resched();