diff options
author | Andi Kleen <ak@linux.intel.com> | 2014-02-08 08:52:01 +0100 |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2014-02-13 18:12:54 -0800 |
commit | 63f9a7fde715352e0769302527670542a664b981 (patch) | |
tree | d3ea74ad4322d31747abd5eb921fb3977e1b2459 | |
parent | a99aa42d0253f033cbb85096d3f2bd82201321e6 (diff) | |
download | op-kernel-dev-63f9a7fde715352e0769302527670542a664b981.zip op-kernel-dev-63f9a7fde715352e0769302527670542a664b981.tar.gz |
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>
-rw-r--r-- | include/linux/lockdep.h | 2 | ||||
-rw-r--r-- | 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; |