Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 9e7f4d451e99b7592a96ad0efaf8bcc1e7b2f854

Authored by Ingo Molnar
Committed by Linus Torvalds
1 parent 61f4c3d6db
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

[PATCH] lockdep: rename DEBUG_WARN_ON() 

Rename DEBUG_WARN_ON() to the less generic DEBUG_LOCKS_WARN_ON() name, so that
it's clear that this is a lock-debugging internal mechanism.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 4 changed files with 26 additions and 26 deletions Side-by-side Diff

kernel/mutex-debug.c
Diff comments   View file @ 9e7f4d4
... ... @@ -373,7 +373,7 @@
373 373 struct thread_info *new_owner __IP_DECL__)
374 374 {
375 375 lock->owner = new_owner;
376   - DEBUG_WARN_ON(!list_empty(&lock->held_list));
  376 + DEBUG_LOCKS_WARN_ON(!list_empty(&lock->held_list));
377 377 if (debug_mutex_on) {
378 378 list_add_tail(&lock->held_list, &debug_mutex_held_locks);
379 379 lock->acquire_ip = ip;
380 380  
381 381  
... ... @@ -389,22 +389,22 @@
389 389  
390 390 void debug_mutex_wake_waiter(struct mutex *lock, struct mutex_waiter *waiter)
391 391 {
392   - SMP_DEBUG_WARN_ON(!spin_is_locked(&lock->wait_lock));
393   - DEBUG_WARN_ON(list_empty(&lock->wait_list));
394   - DEBUG_WARN_ON(waiter->magic != waiter);
395   - DEBUG_WARN_ON(list_empty(&waiter->list));
  392 + SMP_DEBUG_LOCKS_WARN_ON(!spin_is_locked(&lock->wait_lock));
  393 + DEBUG_LOCKS_WARN_ON(list_empty(&lock->wait_list));
  394 + DEBUG_LOCKS_WARN_ON(waiter->magic != waiter);
  395 + DEBUG_LOCKS_WARN_ON(list_empty(&waiter->list));
396 396 }
397 397  
398 398 void debug_mutex_free_waiter(struct mutex_waiter *waiter)
399 399 {
400   - DEBUG_WARN_ON(!list_empty(&waiter->list));
  400 + DEBUG_LOCKS_WARN_ON(!list_empty(&waiter->list));
401 401 memset(waiter, MUTEX_DEBUG_FREE, sizeof(*waiter));
402 402 }
403 403  
404 404 void debug_mutex_add_waiter(struct mutex *lock, struct mutex_waiter *waiter,
405 405 struct thread_info *ti __IP_DECL__)
406 406 {
407   - SMP_DEBUG_WARN_ON(!spin_is_locked(&lock->wait_lock));
  407 + SMP_DEBUG_LOCKS_WARN_ON(!spin_is_locked(&lock->wait_lock));
408 408 check_deadlock(lock, 0, ti, ip);
409 409 /* Mark the current thread as blocked on the lock: */
410 410 ti->task->blocked_on = waiter;
... ... @@ -414,9 +414,9 @@
414 414 void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
415 415 struct thread_info *ti)
416 416 {
417   - DEBUG_WARN_ON(list_empty(&waiter->list));
418   - DEBUG_WARN_ON(waiter->task != ti->task);
419   - DEBUG_WARN_ON(ti->task->blocked_on != waiter);
  417 + DEBUG_LOCKS_WARN_ON(list_empty(&waiter->list));
  418 + DEBUG_LOCKS_WARN_ON(waiter->task != ti->task);
  419 + DEBUG_LOCKS_WARN_ON(ti->task->blocked_on != waiter);
420 420 ti->task->blocked_on = NULL;
421 421  
422 422 list_del_init(&waiter->list);
423 423  
... ... @@ -425,11 +425,11 @@
425 425  
426 426 void debug_mutex_unlock(struct mutex *lock)
427 427 {
428   - DEBUG_WARN_ON(lock->magic != lock);
429   - DEBUG_WARN_ON(!lock->wait_list.prev && !lock->wait_list.next);
430   - DEBUG_WARN_ON(lock->owner != current_thread_info());
  428 + DEBUG_LOCKS_WARN_ON(lock->magic != lock);
  429 + DEBUG_LOCKS_WARN_ON(!lock->wait_list.prev && !lock->wait_list.next);
  430 + DEBUG_LOCKS_WARN_ON(lock->owner != current_thread_info());
431 431 if (debug_mutex_on) {
432   - DEBUG_WARN_ON(list_empty(&lock->held_list));
  432 + DEBUG_LOCKS_WARN_ON(list_empty(&lock->held_list));
433 433 list_del_init(&lock->held_list);
434 434 }
435 435 }
... ... @@ -456,7 +456,7 @@
456 456 */
457 457 void fastcall mutex_destroy(struct mutex *lock)
458 458 {
459   - DEBUG_WARN_ON(mutex_is_locked(lock));
  459 + DEBUG_LOCKS_WARN_ON(mutex_is_locked(lock));
460 460 lock->magic = NULL;
461 461 }
462 462  
kernel/mutex-debug.h
Diff comments   View file @ 9e7f4d4
... ... @@ -65,10 +65,10 @@
65 65 do { \
66 66 struct mutex *l = container_of(lock, struct mutex, wait_lock); \
67 67 \
68   - DEBUG_WARN_ON(in_interrupt()); \
  68 + DEBUG_LOCKS_WARN_ON(in_interrupt()); \
69 69 debug_spin_lock_save(&debug_mutex_lock, flags); \
70 70 spin_lock(lock); \
71   - DEBUG_WARN_ON(l->magic != l); \
  71 + DEBUG_LOCKS_WARN_ON(l->magic != l); \
72 72 } while (0)
73 73  
74 74 #define spin_unlock_mutex(lock, flags) \
... ... @@ -95,7 +95,7 @@
95 95 } \
96 96 } while (0)
97 97  
98   -#define DEBUG_WARN_ON(c) \
  98 +#define DEBUG_LOCKS_WARN_ON(c) \
99 99 do { \
100 100 if (unlikely(c && debug_mutex_on)) { \
101 101 DEBUG_OFF(); \
102 102  
... ... @@ -110,10 +110,10 @@
110 110 } while (0)
111 111  
112 112 #ifdef CONFIG_SMP
113   -# define SMP_DEBUG_WARN_ON(c) DEBUG_WARN_ON(c)
114   -# define SMP_DEBUG_BUG_ON(c) DEBUG_BUG_ON(c)
  113 +# define SMP_DEBUG_LOCKS_WARN_ON(c) DEBUG_LOCKS_WARN_ON(c)
  114 +# define SMP_DEBUG_BUG_ON(c) DEBUG_BUG_ON(c)
115 115 #else
116   -# define SMP_DEBUG_WARN_ON(c) do { } while (0)
117   -# define SMP_DEBUG_BUG_ON(c) do { } while (0)
  116 +# define SMP_DEBUG_LOCKS_WARN_ON(c) do { } while (0)
  117 +# define SMP_DEBUG_BUG_ON(c) do { } while (0)
118 118 #endif
... ... @@ -183,8 +183,8 @@
183 183  
184 184 debug_mutex_free_waiter(&waiter);
185 185  
186   - DEBUG_WARN_ON(list_empty(&lock->held_list));
187   - DEBUG_WARN_ON(lock->owner != task->thread_info);
  186 + DEBUG_LOCKS_WARN_ON(list_empty(&lock->held_list));
  187 + DEBUG_LOCKS_WARN_ON(lock->owner != task->thread_info);
188 188  
189 189 return 0;
190 190 }
... ... @@ -206,7 +206,7 @@
206 206 struct mutex *lock = container_of(lock_count, struct mutex, count);
207 207 unsigned long flags;
208 208  
209   - DEBUG_WARN_ON(lock->owner != current_thread_info());
  209 + DEBUG_LOCKS_WARN_ON(lock->owner != current_thread_info());
210 210  
211 211 spin_lock_mutex(&lock->wait_lock, flags);
212 212  
... ... @@ -16,7 +16,7 @@
16 16 #define mutex_remove_waiter(lock, waiter, ti) \
17 17 __list_del((waiter)->list.prev, (waiter)->list.next)
18 18  
19   -#define DEBUG_WARN_ON(c) do { } while (0)
  19 +#define DEBUG_LOCKS_WARN_ON(c) do { } while (0)
20 20 #define debug_mutex_set_owner(lock, new_owner) do { } while (0)
21 21 #define debug_mutex_clear_owner(lock) do { } while (0)
22 22 #define debug_mutex_init_waiter(waiter) do { } while (0)