diff options
| author | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2017-12-08 10:15:30 -0800 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2017-12-08 10:15:30 -0800 |
| commit | 6647852abc1fd74e9c5e0dcf404ea4cb9c929630 (patch) | |
| tree | 371aa801a5a211f5f8af87bd5488e3dae75ea975 /include/linux/dynamic_queue_limits.h | |
| parent | 3e72be177cf19ab3d62b3084d424dce7e71d847f (diff) | |
| parent | 3f1f0b1c57dd617e9b0ded50efb8d6c011b85b20 (diff) | |
| download | cachepc-linux-6647852abc1fd74e9c5e0dcf404ea4cb9c929630.tar.gz cachepc-linux-6647852abc1fd74e9c5e0dcf404ea4cb9c929630.zip | |
Merge airlied/drm-next into drm-intel-next-queued
Chris requested this backmerge for a reconciliation on
drm_print.h between drm-misc-next and drm-intel-next-queued
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'include/linux/dynamic_queue_limits.h')
| -rw-r--r-- | include/linux/dynamic_queue_limits.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/dynamic_queue_limits.h b/include/linux/dynamic_queue_limits.h index a4be70398ce1..99fc06f0afc1 100644 --- a/include/linux/dynamic_queue_limits.h +++ b/include/linux/dynamic_queue_limits.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Dynamic queue limits (dql) - Definitions * @@ -88,7 +89,7 @@ static inline void dql_queued(struct dql *dql, unsigned int count) /* Returns how many objects can be queued, < 0 indicates over limit. */ static inline int dql_avail(const struct dql *dql) { - return ACCESS_ONCE(dql->adj_limit) - ACCESS_ONCE(dql->num_queued); + return READ_ONCE(dql->adj_limit) - READ_ONCE(dql->num_queued); } /* Record number of completed objects and recalculate the limit. */ @@ -98,7 +99,7 @@ void dql_completed(struct dql *dql, unsigned int count); void dql_reset(struct dql *dql); /* Initialize dql state */ -int dql_init(struct dql *dql, unsigned hold_time); +void dql_init(struct dql *dql, unsigned int hold_time); #endif /* _KERNEL_ */ |