git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[sfrench/cifs-2.6.git]
/
drivers
/
oprofile
/
event_buffer.c
diff --git
a/drivers/oprofile/event_buffer.c
b/drivers/oprofile/event_buffer.c
index 00e937e9240e5b9196de3a6faf08b925842595e6..e7fbac5299354e485c4a4d98774ba4fc0ae7424c 100644
(file)
--- a/
drivers/oprofile/event_buffer.c
+++ b/
drivers/oprofile/event_buffer.c
@@
-70,11
+70,12
@@
void wake_up_buffer_waiter(void)
int alloc_event_buffer(void)
{
int err = -ENOMEM;
int alloc_event_buffer(void)
{
int err = -ENOMEM;
+ unsigned long flags;
- spin_lock
(&oprofilefs_lock
);
+ spin_lock
_irqsave(&oprofilefs_lock, flags
);
buffer_size = fs_buffer_size;
buffer_watershed = fs_buffer_watershed;
buffer_size = fs_buffer_size;
buffer_watershed = fs_buffer_watershed;
- spin_unlock
(&oprofilefs_lock
);
+ spin_unlock
_irqrestore(&oprofilefs_lock, flags
);
if (buffer_watershed >= buffer_size)
return -EINVAL;
if (buffer_watershed >= buffer_size)
return -EINVAL;