diff options
Diffstat (limited to 'kernel/sched.c')
-rw-r--r-- | kernel/sched.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index 8e2558c2ba67..328f9c7448a5 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
@@ -4404,10 +4404,7 @@ void scheduler_tick(void) | |||
4404 | #endif | 4404 | #endif |
4405 | } | 4405 | } |
4406 | 4406 | ||
4407 | #if defined(CONFIG_PREEMPT) && (defined(CONFIG_DEBUG_PREEMPT) || \ | 4407 | unsigned long get_parent_ip(unsigned long addr) |
4408 | defined(CONFIG_PREEMPT_TRACER)) | ||
4409 | |||
4410 | static inline unsigned long get_parent_ip(unsigned long addr) | ||
4411 | { | 4408 | { |
4412 | if (in_lock_functions(addr)) { | 4409 | if (in_lock_functions(addr)) { |
4413 | addr = CALLER_ADDR2; | 4410 | addr = CALLER_ADDR2; |
@@ -4417,6 +4414,9 @@ static inline unsigned long get_parent_ip(unsigned long addr) | |||
4417 | return addr; | 4414 | return addr; |
4418 | } | 4415 | } |
4419 | 4416 | ||
4417 | #if defined(CONFIG_PREEMPT) && (defined(CONFIG_DEBUG_PREEMPT) || \ | ||
4418 | defined(CONFIG_PREEMPT_TRACER)) | ||
4419 | |||
4420 | void __kprobes add_preempt_count(int val) | 4420 | void __kprobes add_preempt_count(int val) |
4421 | { | 4421 | { |
4422 | #ifdef CONFIG_DEBUG_PREEMPT | 4422 | #ifdef CONFIG_DEBUG_PREEMPT |