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 55a10b8e31bb..bec249885e17 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
@@ -4773,10 +4773,7 @@ void scheduler_tick(void) | |||
4773 | #endif | 4773 | #endif |
4774 | } | 4774 | } |
4775 | 4775 | ||
4776 | #if defined(CONFIG_PREEMPT) && (defined(CONFIG_DEBUG_PREEMPT) || \ | 4776 | unsigned long get_parent_ip(unsigned long addr) |
4777 | defined(CONFIG_PREEMPT_TRACER)) | ||
4778 | |||
4779 | static inline unsigned long get_parent_ip(unsigned long addr) | ||
4780 | { | 4777 | { |
4781 | if (in_lock_functions(addr)) { | 4778 | if (in_lock_functions(addr)) { |
4782 | addr = CALLER_ADDR2; | 4779 | addr = CALLER_ADDR2; |
@@ -4786,6 +4783,9 @@ static inline unsigned long get_parent_ip(unsigned long addr) | |||
4786 | return addr; | 4783 | return addr; |
4787 | } | 4784 | } |
4788 | 4785 | ||
4786 | #if defined(CONFIG_PREEMPT) && (defined(CONFIG_DEBUG_PREEMPT) || \ | ||
4787 | defined(CONFIG_PREEMPT_TRACER)) | ||
4788 | |||
4789 | void __kprobes add_preempt_count(int val) | 4789 | void __kprobes add_preempt_count(int val) |
4790 | { | 4790 | { |
4791 | #ifdef CONFIG_DEBUG_PREEMPT | 4791 | #ifdef CONFIG_DEBUG_PREEMPT |