diff options
| author | Mark Brown <broonie@kernel.org> | 2015-03-11 15:53:25 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-03-11 15:53:25 +0300 |
| commit | 11dd60447e3b1018f9cae66737cb902b519d3454 (patch) | |
| tree | a33d8bcb18a3becae2161aa215c25d5674626c57 /drivers/block/zram/zram_drv.c | |
| parent | 8d0c38a3f2a6bb70e952f127ed817fc7a08db52c (diff) | |
| parent | 9eccca0843205f87c00404b663188b88eb248051 (diff) | |
| download | linux-11dd60447e3b1018f9cae66737cb902b519d3454.tar.xz | |
Merge tag 'v4.0-rc3' into asoc-intel
Linux 4.0-rc3
Diffstat (limited to 'drivers/block/zram/zram_drv.c')
| -rw-r--r-- | drivers/block/zram/zram_drv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index 8e233edd7a09..871bd3550cb0 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -528,7 +528,7 @@ out_cleanup: static inline void update_used_max(struct zram *zram, const unsigned long pages) { - int old_max, cur_max; + unsigned long old_max, cur_max; old_max = atomic_long_read(&zram->stats.max_used_pages); |