Merge branch 'tegra/dt64' into arm/fixes

[linux-2.6-microblaze.git] / include / linux / zsmalloc.h

diff --git a/include/linux/zsmalloc.h b/include/linux/zsmalloc.h
index 4807ca4..2a430e7 100644 (file)
--- a/include/linux/zsmalloc.h
+++ b/include/linux/zsmalloc.h
@@ -35,7 +35,7 @@ enum zs_mapmode {
 
 struct zs_pool_stats {
        /* How many pages were migrated (freed) */
-       unsigned long pages_compacted;
+       atomic_long_t pages_compacted;
 };
 
 struct zs_pool;