Skip to content

Commit

Permalink
Merge branch 'for-4.16' of git://git.kernel.org/pub/scm/linux/kernel/…
Browse files Browse the repository at this point in the history
…git/tj/percpu

Pull percpu update from Tejun Heo:
 "One trivial patch to convert the return type from int to bool"

* 'for-4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
  percpu: percpu_counter_initialized can be boolean
  • Loading branch information
torvalds committed Jan 30, 2018
2 parents 76a250f + 85dcbba commit 289104c
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions include/linux/percpu_counter.h
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ static inline s64 percpu_counter_read_positive(struct percpu_counter *fbc)
return 0;
}

static inline int percpu_counter_initialized(struct percpu_counter *fbc)
static inline bool percpu_counter_initialized(struct percpu_counter *fbc)
{
return (fbc->counters != NULL);
}
Expand Down Expand Up @@ -167,9 +167,9 @@ static inline s64 percpu_counter_sum(struct percpu_counter *fbc)
return percpu_counter_read(fbc);
}

static inline int percpu_counter_initialized(struct percpu_counter *fbc)
static inline bool percpu_counter_initialized(struct percpu_counter *fbc)
{
return 1;
return true;
}

#endif /* CONFIG_SMP */
Expand Down

0 comments on commit 289104c

Please sign in to comment.