git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc
[pandora-kernel.git]
/
kernel
/
cpuset.c
diff --git
a/kernel/cpuset.c
b/kernel/cpuset.c
index
c4d123f
..
57e6448
100644
(file)
--- a/
kernel/cpuset.c
+++ b/
kernel/cpuset.c
@@
-516,7
+516,7
@@
static void cpuset_release_agent(const char *pathbuf)
envp[i++] = "PATH=/sbin:/bin:/usr/sbin:/usr/bin";
envp[i] = NULL;
envp[i++] = "PATH=/sbin:/bin:/usr/sbin:/usr/bin";
envp[i] = NULL;
- call_usermodehelper(argv[0], argv, envp,
0
);
+ call_usermodehelper(argv[0], argv, envp,
UMH_WAIT_EXEC
);
kfree(pathbuf);
}
kfree(pathbuf);
}
@@
-981,10
+981,10
@@
static int update_nodemask(struct cpuset *cs, char *buf)
mmarray = kmalloc(ntasks * sizeof(*mmarray), GFP_KERNEL);
if (!mmarray)
goto done;
mmarray = kmalloc(ntasks * sizeof(*mmarray), GFP_KERNEL);
if (!mmarray)
goto done;
-
write_lock_irq(&tasklist_lock);
/* block fork */
+
read_lock(&tasklist_lock);
/* block fork */
if (atomic_read(&cs->count) <= ntasks)
break; /* got enough */
if (atomic_read(&cs->count) <= ntasks)
break; /* got enough */
-
write_unlock_irq(&tasklist_lock);
/* try again */
+
read_unlock(&tasklist_lock);
/* try again */
kfree(mmarray);
}
kfree(mmarray);
}
@@
-1006,7
+1006,7
@@
static int update_nodemask(struct cpuset *cs, char *buf)
continue;
mmarray[n++] = mm;
} while_each_thread(g, p);
continue;
mmarray[n++] = mm;
} while_each_thread(g, p);
-
write_unlock_irq
(&tasklist_lock);
+
read_unlock
(&tasklist_lock);
/*
* Now that we've dropped the tasklist spinlock, we can
/*
* Now that we've dropped the tasklist spinlock, we can