diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-07 19:22:10 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-07 19:22:10 +0100 |
| commit | 01aab518b084a547940ed6ff334e9a7721c7dc71 (patch) | |
| tree | 627f0c7e4833b1c563aba403a1f731fc7c4f3b0c /drivers | |
| parent | fed4d59b6ec5481caceb17863f19a0b0e5eaa939 (diff) | |
| parent | 7c64ade53a6f977d73f16243865c42ceae999aea (diff) | |
| download | op-kernel-dev-01aab518b084a547940ed6ff334e9a7721c7dc71.zip op-kernel-dev-01aab518b084a547940ed6ff334e9a7721c7dc71.tar.gz | |
Merge branch 'oprofile-for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into x86/urgent
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/oprofile/event_buffer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/oprofile/event_buffer.c b/drivers/oprofile/event_buffer.c index d962ba0..191a320 100644 --- a/drivers/oprofile/event_buffer.c +++ b/drivers/oprofile/event_buffer.c @@ -105,7 +105,7 @@ static int event_buffer_open(struct inode *inode, struct file *file) if (!capable(CAP_SYS_ADMIN)) return -EPERM; - if (test_and_set_bit(0, &buffer_opened)) + if (test_and_set_bit_lock(0, &buffer_opened)) return -EBUSY; /* Register as a user of dcookies @@ -129,7 +129,7 @@ static int event_buffer_open(struct inode *inode, struct file *file) fail: dcookie_unregister(file->private_data); out: - clear_bit(0, &buffer_opened); + __clear_bit_unlock(0, &buffer_opened); return err; } @@ -141,7 +141,7 @@ static int event_buffer_release(struct inode *inode, struct file *file) dcookie_unregister(file->private_data); buffer_pos = 0; atomic_set(&buffer_ready, 0); - clear_bit(0, &buffer_opened); + __clear_bit_unlock(0, &buffer_opened); return 0; } |
