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 73513f4e19df..f01cb63d1356 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
@@ -4781,10 +4781,7 @@ void scheduler_tick(void) | |||
4781 | #endif | 4781 | #endif |
4782 | } | 4782 | } |
4783 | 4783 | ||
4784 | #if defined(CONFIG_PREEMPT) && (defined(CONFIG_DEBUG_PREEMPT) || \ | 4784 | unsigned long get_parent_ip(unsigned long addr) |
4785 | defined(CONFIG_PREEMPT_TRACER)) | ||
4786 | |||
4787 | static inline unsigned long get_parent_ip(unsigned long addr) | ||
4788 | { | 4785 | { |
4789 | if (in_lock_functions(addr)) { | 4786 | if (in_lock_functions(addr)) { |
4790 | addr = CALLER_ADDR2; | 4787 | addr = CALLER_ADDR2; |
@@ -4794,6 +4791,9 @@ static inline unsigned long get_parent_ip(unsigned long addr) | |||
4794 | return addr; | 4791 | return addr; |
4795 | } | 4792 | } |
4796 | 4793 | ||
4794 | #if defined(CONFIG_PREEMPT) && (defined(CONFIG_DEBUG_PREEMPT) || \ | ||
4795 | defined(CONFIG_PREEMPT_TRACER)) | ||
4796 | |||
4797 | void __kprobes add_preempt_count(int val) | 4797 | void __kprobes add_preempt_count(int val) |
4798 | { | 4798 | { |
4799 | #ifdef CONFIG_DEBUG_PREEMPT | 4799 | #ifdef CONFIG_DEBUG_PREEMPT |