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 tag 'backlight-for-linus-3.18' of git://git.kernel.org/pub/scm/linux/kernel...
[firefly-linux-kernel-4.4.55.git]
/
lib
/
flex_proportions.c
diff --git
a/lib/flex_proportions.c
b/lib/flex_proportions.c
index ebf3bac460b01c3638e87d23975426f448d58064..8f25652f40d4f3aafc770b87b2692b54629a6273 100644
(file)
--- a/
lib/flex_proportions.c
+++ b/
lib/flex_proportions.c
@@
-34,13
+34,13
@@
*/
#include <linux/flex_proportions.h>
*/
#include <linux/flex_proportions.h>
-int fprop_global_init(struct fprop_global *p)
+int fprop_global_init(struct fprop_global *p
, gfp_t gfp
)
{
int err;
p->period = 0;
/* Use 1 to avoid dealing with periods with 0 events... */
{
int err;
p->period = 0;
/* Use 1 to avoid dealing with periods with 0 events... */
- err = percpu_counter_init(&p->events, 1);
+ err = percpu_counter_init(&p->events, 1
, gfp
);
if (err)
return err;
seqcount_init(&p->sequence);
if (err)
return err;
seqcount_init(&p->sequence);
@@
-168,11
+168,11
@@
void fprop_fraction_single(struct fprop_global *p,
*/
#define PROP_BATCH (8*(1+ilog2(nr_cpu_ids)))
*/
#define PROP_BATCH (8*(1+ilog2(nr_cpu_ids)))
-int fprop_local_init_percpu(struct fprop_local_percpu *pl)
+int fprop_local_init_percpu(struct fprop_local_percpu *pl
, gfp_t gfp
)
{
int err;
{
int err;
- err = percpu_counter_init(&pl->events, 0);
+ err = percpu_counter_init(&pl->events, 0
, gfp
);
if (err)
return err;
pl->period = 0;
if (err)
return err;
pl->period = 0;