projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.infradead.org/~dwmw2/ideapad-2.6
[firefly-linux-kernel-4.4.55.git]
/
kernel
/
sched_cpupri.c
diff --git
a/kernel/sched_cpupri.c
b/kernel/sched_cpupri.c
index e6871cb3fc83dde1901b62c6355edc30ea55a64e..2722dc1b41383fa6f8108802315cbc82c3c1e814 100644
(file)
--- a/
kernel/sched_cpupri.c
+++ b/
kernel/sched_cpupri.c
@@
-166,14
+166,10
@@
void cpupri_set(struct cpupri *cp, int cpu, int newpri)
*
* Returns: -ENOMEM if memory fails.
*/
*
* Returns: -ENOMEM if memory fails.
*/
-int cpupri_init(struct cpupri *cp
, bool bootmem
)
+int cpupri_init(struct cpupri *cp)
{
{
- gfp_t gfp = GFP_KERNEL;
int i;
int i;
- if (bootmem)
- gfp = GFP_NOWAIT;
-
memset(cp, 0, sizeof(*cp));
for (i = 0; i < CPUPRI_NR_PRIORITIES; i++) {
memset(cp, 0, sizeof(*cp));
for (i = 0; i < CPUPRI_NR_PRIORITIES; i++) {
@@
-181,7
+177,7
@@
int cpupri_init(struct cpupri *cp, bool bootmem)
raw_spin_lock_init(&vec->lock);
vec->count = 0;
raw_spin_lock_init(&vec->lock);
vec->count = 0;
- if (!zalloc_cpumask_var(&vec->mask,
gfp
))
+ if (!zalloc_cpumask_var(&vec->mask,
GFP_KERNEL
))
goto cleanup;
}
goto cleanup;
}