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 242d0d47a70d..566c8c9e3a6d 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
@@ -4409,10 +4409,7 @@ void scheduler_tick(void) | |||
4409 | #endif | 4409 | #endif |
4410 | } | 4410 | } |
4411 | 4411 | ||
4412 | #if defined(CONFIG_PREEMPT) && (defined(CONFIG_DEBUG_PREEMPT) || \ | 4412 | unsigned long get_parent_ip(unsigned long addr) |
4413 | defined(CONFIG_PREEMPT_TRACER)) | ||
4414 | |||
4415 | static inline unsigned long get_parent_ip(unsigned long addr) | ||
4416 | { | 4413 | { |
4417 | if (in_lock_functions(addr)) { | 4414 | if (in_lock_functions(addr)) { |
4418 | addr = CALLER_ADDR2; | 4415 | addr = CALLER_ADDR2; |
@@ -4422,6 +4419,9 @@ static inline unsigned long get_parent_ip(unsigned long addr) | |||
4422 | return addr; | 4419 | return addr; |
4423 | } | 4420 | } |
4424 | 4421 | ||
4422 | #if defined(CONFIG_PREEMPT) && (defined(CONFIG_DEBUG_PREEMPT) || \ | ||
4423 | defined(CONFIG_PREEMPT_TRACER)) | ||
4424 | |||
4425 | void __kprobes add_preempt_count(int val) | 4425 | void __kprobes add_preempt_count(int val) |
4426 | { | 4426 | { |
4427 | #ifdef CONFIG_DEBUG_PREEMPT | 4427 | #ifdef CONFIG_DEBUG_PREEMPT |