Changeset c621f4aa in mainline for kernel/genarch/src/drivers/via-cuda/cuda.c

Timestamp:

2010-07-25T10:11:13Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

377cce8

Parents:

24a2517 (diff), a2da43c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with mainline.

File:

• kernel/genarch/src/drivers/via-cuda/cuda.c (modified) (1 diff)

kernel/genarch/src/drivers/via-cuda/cuda.c

@@ -99 +99 @@
                 instance->snd_bytes = 0;
 
-                spinlock_initialize(&instance->dev_lock, "cuda_dev");
+                spinlock_initialize(&instance->dev_lock, "cuda.instance.dev_lock");
 
                 /* Disable all interrupts from CUDA. */