From 8d6cbf5e2e31baa255607582d1531f61d149ffc0 Mon Sep 17 00:00:00 2001 From: Tony Luck Date: Thu, 26 Jul 2012 10:55:26 -0700 Subject: [PATCH] --- yaml --- r: 319812 b: refs/heads/master c: a119365586b0130dfea06457f584953e0ff6481d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/ia64/include/asm/atomic.h | 4 ++-- trunk/drivers/char/mspec.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 1a155b926705..91c500a6d64e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f9445a382e3b9fdd21db41a4825ca1399cd0a3f4 +refs/heads/master: a119365586b0130dfea06457f584953e0ff6481d diff --git a/trunk/arch/ia64/include/asm/atomic.h b/trunk/arch/ia64/include/asm/atomic.h index 7d9116600a36..6e6fe1839f5d 100644 --- a/trunk/arch/ia64/include/asm/atomic.h +++ b/trunk/arch/ia64/include/asm/atomic.h @@ -17,8 +17,8 @@ #include -#define ATOMIC_INIT(i) ((atomic_t) { (i) }) -#define ATOMIC64_INIT(i) ((atomic64_t) { (i) }) +#define ATOMIC_INIT(i) { (i) } +#define ATOMIC64_INIT(i) { (i) } #define atomic_read(v) (*(volatile int *)&(v)->counter) #define atomic64_read(v) (*(volatile long *)&(v)->counter) diff --git a/trunk/drivers/char/mspec.c b/trunk/drivers/char/mspec.c index 8b78750f1efe..845f97fd1832 100644 --- a/trunk/drivers/char/mspec.c +++ b/trunk/drivers/char/mspec.c @@ -283,7 +283,7 @@ mspec_mmap(struct file *file, struct vm_area_struct *vma, vdata->flags = flags; vdata->type = type; spin_lock_init(&vdata->lock); - vdata->refcnt = ATOMIC_INIT(1); + atomic_set(&vdata->refcnt, 1); vma->vm_private_data = vdata; vma->vm_flags |= (VM_IO | VM_RESERVED | VM_PFNMAP | VM_DONTEXPAND);