diff options
-rw-r--r-- | arch/ia64/include/asm/atomic.h | 4 | ||||
-rw-r--r-- | drivers/char/mspec.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/ia64/include/asm/atomic.h b/arch/ia64/include/asm/atomic.h index 7d9116600a36..6e6fe1839f5d 100644 --- a/arch/ia64/include/asm/atomic.h +++ b/arch/ia64/include/asm/atomic.h | |||
@@ -17,8 +17,8 @@ | |||
17 | #include <asm/intrinsics.h> | 17 | #include <asm/intrinsics.h> |
18 | 18 | ||
19 | 19 | ||
20 | #define ATOMIC_INIT(i) ((atomic_t) { (i) }) | 20 | #define ATOMIC_INIT(i) { (i) } |
21 | #define ATOMIC64_INIT(i) ((atomic64_t) { (i) }) | 21 | #define ATOMIC64_INIT(i) { (i) } |
22 | 22 | ||
23 | #define atomic_read(v) (*(volatile int *)&(v)->counter) | 23 | #define atomic_read(v) (*(volatile int *)&(v)->counter) |
24 | #define atomic64_read(v) (*(volatile long *)&(v)->counter) | 24 | #define atomic64_read(v) (*(volatile long *)&(v)->counter) |
diff --git a/drivers/char/mspec.c b/drivers/char/mspec.c index 8b78750f1efe..845f97fd1832 100644 --- a/drivers/char/mspec.c +++ b/drivers/char/mspec.c | |||
@@ -283,7 +283,7 @@ mspec_mmap(struct file *file, struct vm_area_struct *vma, | |||
283 | vdata->flags = flags; | 283 | vdata->flags = flags; |
284 | vdata->type = type; | 284 | vdata->type = type; |
285 | spin_lock_init(&vdata->lock); | 285 | spin_lock_init(&vdata->lock); |
286 | vdata->refcnt = ATOMIC_INIT(1); | 286 | atomic_set(&vdata->refcnt, 1); |
287 | vma->vm_private_data = vdata; | 287 | vma->vm_private_data = vdata; |
288 | 288 | ||
289 | vma->vm_flags |= (VM_IO | VM_RESERVED | VM_PFNMAP | VM_DONTEXPAND); | 289 | vma->vm_flags |= (VM_IO | VM_RESERVED | VM_PFNMAP | VM_DONTEXPAND); |