diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-30 13:22:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-30 13:22:19 -0700 |
| commit | 6d8a97af63222c5cbc7fe63ae19345e74e153e90 (patch) | |
| tree | 4b3e286c1f68bece1e839ae63f5c659711cae47d /drivers/char | |
| parent | Merge tag 'localmodconfig-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig (diff) | |
| parent | [IA64] Redefine ATOMIC_INIT and ATOMIC64_INIT to drop the casts (diff) | |
| download | linux-dev-6d8a97af63222c5cbc7fe63ae19345e74e153e90.tar.xz linux-dev-6d8a97af63222c5cbc7fe63ae19345e74e153e90.zip | |
Merge tag 'please-pull-ia64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
Pull misc ia64 build fixes from Tony Luck.
* tag 'please-pull-ia64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
[IA64] Redefine ATOMIC_INIT and ATOMIC64_INIT to drop the casts
[IA64] Rename platform_name to ia64_platform_name
[IA64] Mark PARAVIRT and KVM as broken
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/mspec.c | 2 |
1 files changed, 1 insertions, 1 deletions
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, 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); |