diff options
| author | J. Bruce Fields | 2010-03-04 18:03:16 +0100 |
|---|---|---|
| committer | J. Bruce Fields | 2010-03-04 18:04:51 +0100 |
| commit | 4ea41e2de5bba756858bb40f964e3490b6d1a25c (patch) | |
| tree | 51a688be321dd42f80d8a0c966eb6a60408d50b3 /kernel/sys.c | |
| parent | nfsd4: fix minor memory leak (diff) | |
| parent | Merge branch 'linux-2.6.33' (diff) | |
| download | kernel-qcow2-linux-4ea41e2de5bba756858bb40f964e3490b6d1a25c.tar.gz kernel-qcow2-linux-4ea41e2de5bba756858bb40f964e3490b6d1a25c.tar.xz kernel-qcow2-linux-4ea41e2de5bba756858bb40f964e3490b6d1a25c.zip | |
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs into for-2.6.34-incoming
Resolve merge conflict in fs/xfs/linux-2.6/xfs_export.c.
Diffstat (limited to 'kernel/sys.c')
| -rw-r--r-- | kernel/sys.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/sys.c b/kernel/sys.c index 26a6b73a6b85..18bde979f346 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -222,6 +222,7 @@ SYSCALL_DEFINE2(getpriority, int, which, int, who) if (which > PRIO_USER || which < PRIO_PROCESS) return -EINVAL; + rcu_read_lock(); read_lock(&tasklist_lock); switch (which) { case PRIO_PROCESS: @@ -267,6 +268,7 @@ SYSCALL_DEFINE2(getpriority, int, which, int, who) } out_unlock: read_unlock(&tasklist_lock); + rcu_read_unlock(); return retval; } |