diff options
author | Andi Kleen <ak@linux.intel.com> | 2014-02-08 02:52:01 -0500 |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2014-02-13 21:12:54 -0500 |
commit | 63f9a7fde715352e0769302527670542a664b981 (patch) | |
tree | d3ea74ad4322d31747abd5eb921fb3977e1b2459 | |
parent | a99aa42d0253f033cbb85096d3f2bd82201321e6 (diff) |
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 92b1bfc5da60..7df9aa6902c0 100644 --- a/include/linux/lockdep.h +++ b/include/linux/lockdep.h | |||
@@ -265,7 +265,7 @@ extern void lockdep_info(void); | |||
265 | extern void lockdep_reset(void); | 265 | extern void lockdep_reset(void); |
266 | extern void lockdep_reset_lock(struct lockdep_map *lock); | 266 | extern void lockdep_reset_lock(struct lockdep_map *lock); |
267 | extern void lockdep_free_key_range(void *start, unsigned long size); | 267 | extern void lockdep_free_key_range(void *start, unsigned long size); |
268 | extern void lockdep_sys_exit(void); | 268 | extern asmlinkage void lockdep_sys_exit(void); |
269 | 269 | ||
270 | extern void lockdep_off(void); | 270 | extern void lockdep_off(void); |
271 | extern void lockdep_on(void); | 271 | extern void lockdep_on(void); |
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c index eb8a54783fa0..c8b6753c5bb1 100644 --- a/kernel/locking/lockdep.c +++ b/kernel/locking/lockdep.c | |||
@@ -4191,7 +4191,7 @@ void debug_show_held_locks(struct task_struct *task) | |||
4191 | } | 4191 | } |
4192 | EXPORT_SYMBOL_GPL(debug_show_held_locks); | 4192 | EXPORT_SYMBOL_GPL(debug_show_held_locks); |
4193 | 4193 | ||
4194 | void lockdep_sys_exit(void) | 4194 | asmlinkage void lockdep_sys_exit(void) |
4195 | { | 4195 | { |
4196 | struct task_struct *curr = current; | 4196 | struct task_struct *curr = current; |
4197 | 4197 | ||