Messages in this thread Patch in this message | | | Date | Thu, 13 Feb 2014 19:58:32 -0800 | From | tip-bot for Andi Kleen <> | Subject | [tip:x86/asmlinkage] asmlinkage: Make lockdep_sys_exit asmlinkage |
| |
Commit-ID: 63f9a7fde715352e0769302527670542a664b981 Gitweb: http://git.kernel.org/tip/63f9a7fde715352e0769302527670542a664b981 Author: Andi Kleen <ak@linux.intel.com> AuthorDate: Sat, 8 Feb 2014 08:52:01 +0100 Committer: H. Peter Anvin <hpa@linux.intel.com> CommitDate: Thu, 13 Feb 2014 18:12:54 -0800
asmlinkage: Make lockdep_sys_exit asmlinkage
lockdep_sys_exit can be called from assembler code, so make it asmlinkage.
Cc: Peter Zijlstra <peterz@infradead.org> Cc: Ingo Molnar <mingo@kernel.org> Signed-off-by: Andi Kleen <ak@linux.intel.com> Link: http://lkml.kernel.org/r/1391845930-28580-5-git-send-email-ak@linux.intel.com Signed-off-by: H. Peter Anvin <hpa@linux.intel.com> --- include/linux/lockdep.h | 2 +- kernel/locking/lockdep.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h index 92b1bfc..7df9aa6 100644 --- a/include/linux/lockdep.h +++ b/include/linux/lockdep.h @@ -265,7 +265,7 @@ extern void lockdep_info(void); extern void lockdep_reset(void); extern void lockdep_reset_lock(struct lockdep_map *lock); extern void lockdep_free_key_range(void *start, unsigned long size); -extern void lockdep_sys_exit(void); +extern asmlinkage void lockdep_sys_exit(void); extern void lockdep_off(void); extern void lockdep_on(void); diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c index eb8a547..c8b6753c 100644 --- a/kernel/locking/lockdep.c +++ b/kernel/locking/lockdep.c @@ -4191,7 +4191,7 @@ void debug_show_held_locks(struct task_struct *task) } EXPORT_SYMBOL_GPL(debug_show_held_locks); -void lockdep_sys_exit(void) +asmlinkage void lockdep_sys_exit(void) { struct task_struct *curr = current;
| |