openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/nouveau/nouveau: Do not BUG_ON(!spin_is_locked()) on UP 

On !SMP systems spinlocks do not exist. Thus checking of they
are active will always fail.

Use
  assert_spin_locked(lock);
instead of
  BUG_ON(!spin_is_locked(lock));
to not BUG() on all UP systems.

Signed-off-by: Bruno Prémont <bonbons@linux-vserver.org>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Bruno Prémont 2014-12-21 17:43:31 +01:00 committed by Ben Skeggs
parent 4761703bd0
commit ff4c0d5213
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/nouveau/core/core/event.c
View File

@ -26,7 +26,7 @@
void void
nvkm_event_put(struct nvkm_event *event, u32 types, int index) nvkm_event_put(struct nvkm_event *event, u32 types, int index)
{ {
BUG_ON(!spin_is_locked(&event->refs_lock)); assert_spin_locked(&event->refs_lock);
while (types) { while (types) {
int type = __ffs(types); types &= ~(1 << type); int type = __ffs(types); types &= ~(1 << type);
if (--event->refs[index * event->types_nr + type] == 0) { if (--event->refs[index * event->types_nr + type] == 0) {
@ -39,7 +39,7 @@ nvkm_event_put(struct nvkm_event *event, u32 types, int index)
void void
nvkm_event_get(struct nvkm_event *event, u32 types, int index) nvkm_event_get(struct nvkm_event *event, u32 types, int index)
{ {
BUG_ON(!spin_is_locked(&event->refs_lock)); assert_spin_locked(&event->refs_lock);
while (types) { while (types) {
int type = __ffs(types); types &= ~(1 << type); int type = __ffs(types); types &= ~(1 << type);
if (++event->refs[index * event->types_nr + type] == 1) { if (++event->refs[index * event->types_nr + type] == 1) {

2
drivers/gpu/drm/nouveau/core/core/notify.c
View File

@ -98,7 +98,7 @@ nvkm_notify_send(struct nvkm_notify *notify, void *data, u32 size)
struct nvkm_event *event = notify->event; struct nvkm_event *event = notify->event;
unsigned long flags; unsigned long flags;
BUG_ON(!spin_is_locked(&event->list_lock)); assert_spin_locked(&event->list_lock);
BUG_ON(size != notify->size); BUG_ON(size != notify->size);
spin_lock_irqsave(&event->refs_lock, flags); spin_lock_irqsave(&event->refs_lock, flags);