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 'tracing/ftrace'; commit 'v2.6.29-rc7' into tracing/core
[pandora-kernel.git]
/
kernel
/
sched.c
diff --git
a/kernel/sched.c
b/kernel/sched.c
index
8e2558c
..
328f9c7
100644
(file)
--- a/
kernel/sched.c
+++ b/
kernel/sched.c
@@
-4404,10
+4404,7
@@
void scheduler_tick(void)
#endif
}
#endif
}
-#if defined(CONFIG_PREEMPT) && (defined(CONFIG_DEBUG_PREEMPT) || \
- defined(CONFIG_PREEMPT_TRACER))
-
-static inline unsigned long get_parent_ip(unsigned long addr)
+unsigned long get_parent_ip(unsigned long addr)
{
if (in_lock_functions(addr)) {
addr = CALLER_ADDR2;
{
if (in_lock_functions(addr)) {
addr = CALLER_ADDR2;
@@
-4417,6
+4414,9
@@
static inline unsigned long get_parent_ip(unsigned long addr)
return addr;
}
return addr;
}
+#if defined(CONFIG_PREEMPT) && (defined(CONFIG_DEBUG_PREEMPT) || \
+ defined(CONFIG_PREEMPT_TRACER))
+
void __kprobes add_preempt_count(int val)
{
#ifdef CONFIG_DEBUG_PREEMPT
void __kprobes add_preempt_count(int val)
{
#ifdef CONFIG_DEBUG_PREEMPT