projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linux-2.6'
[powerpc.git]
/
drivers
/
oprofile
/
oprofilefs.c
diff --git
a/drivers/oprofile/oprofilefs.c
b/drivers/oprofile/oprofilefs.c
index
6e67b42
..
8543cb2
100644
(file)
--- a/
drivers/oprofile/oprofilefs.c
+++ b/
drivers/oprofile/oprofilefs.c
@@
-65,6
+65,7
@@
ssize_t oprofilefs_ulong_to_user(unsigned long val, char __user * buf, size_t co
int oprofilefs_ulong_from_user(unsigned long * val, char const __user * buf, size_t count)
{
char tmpbuf[TMPBUFSIZE];
int oprofilefs_ulong_from_user(unsigned long * val, char const __user * buf, size_t count)
{
char tmpbuf[TMPBUFSIZE];
+ unsigned long flags;
if (!count)
return 0;
if (!count)
return 0;
@@
-77,9
+78,9
@@
int oprofilefs_ulong_from_user(unsigned long * val, char const __user * buf, siz
if (copy_from_user(tmpbuf, buf, count))
return -EFAULT;
if (copy_from_user(tmpbuf, buf, count))
return -EFAULT;
- spin_lock
(&oprofilefs_lock
);
+ spin_lock
_irqsave(&oprofilefs_lock, flags
);
*val = simple_strtoul(tmpbuf, NULL, 0);
*val = simple_strtoul(tmpbuf, NULL, 0);
- spin_unlock
(&oprofilefs_lock
);
+ spin_unlock
_irqrestore(&oprofilefs_lock, flags
);
return 0;
}
return 0;
}