diff options
| author | Mark Brown <[email protected]> | 2015-10-12 18:09:27 +0100 | 
|---|---|---|
| committer | Mark Brown <[email protected]> | 2015-10-12 18:09:27 +0100 | 
| commit | 79828b4fa835f73cdaf4bffa48696abdcbea9d02 (patch) | |
| tree | 5e0fa7156acb75ba603022bc807df8f2fedb97a8 /mm/zbud.c | |
| parent | 721b51fcf91898299d96f4b72cb9434cda29dce6 (diff) | |
| parent | 8c1a9d6323abf0fb1e5dad96cf3f1c783505ea5a (diff) | |
Merge remote-tracking branch 'asoc/fix/rt5645' into asoc-fix-rt5645
Diffstat (limited to 'mm/zbud.c')
| -rw-r--r-- | mm/zbud.c | 10 | 
1 files changed, 5 insertions, 5 deletions
diff --git a/mm/zbud.c b/mm/zbud.c index f3bf6f7627d8..fa48bcdff9d5 100644 --- a/mm/zbud.c +++ b/mm/zbud.c @@ -96,10 +96,10 @@ struct zbud_pool {  	struct list_head buddied;  	struct list_head lru;  	u64 pages_nr; -	struct zbud_ops *ops; +	const struct zbud_ops *ops;  #ifdef CONFIG_ZPOOL  	struct zpool *zpool; -	struct zpool_ops *zpool_ops; +	const struct zpool_ops *zpool_ops;  #endif  }; @@ -133,12 +133,12 @@ static int zbud_zpool_evict(struct zbud_pool *pool, unsigned long handle)  		return -ENOENT;  } -static struct zbud_ops zbud_zpool_ops = { +static const struct zbud_ops zbud_zpool_ops = {  	.evict =	zbud_zpool_evict  };  static void *zbud_zpool_create(char *name, gfp_t gfp, -			       struct zpool_ops *zpool_ops, +			       const struct zpool_ops *zpool_ops,  			       struct zpool *zpool)  {  	struct zbud_pool *pool; @@ -302,7 +302,7 @@ static int num_free_chunks(struct zbud_header *zhdr)   * Return: pointer to the new zbud pool or NULL if the metadata allocation   * failed.   */ -struct zbud_pool *zbud_create_pool(gfp_t gfp, struct zbud_ops *ops) +struct zbud_pool *zbud_create_pool(gfp_t gfp, const struct zbud_ops *ops)  {  	struct zbud_pool *pool;  	int i;  |