Merge remote-tracking branch 'staging/staging-next'

[deliverable/linux.git] / drivers / staging / android / lowmemorykiller.c

diff --git a/drivers/staging/android/lowmemorykiller.c b/drivers/staging/android/lowmemorykiller.c
index 45a1b4ec4ca33000e96faee0cb1cff7933b91580..80d7adf439c7b7954bb80a2ae5e80e9b9f84ecd0 100644 (file)
--- a/drivers/staging/android/lowmemorykiller.c
+++ b/drivers/staging/android/lowmemorykiller.c
@@ -92,8 +92,8 @@ static unsigned long lowmem_scan(struct shrinker *s, struct shrink_control *sc)
        int array_size = ARRAY_SIZE(lowmem_adj);
        int other_free = global_page_state(NR_FREE_PAGES) - totalreserve_pages;
        int other_file = global_node_page_state(NR_FILE_PAGES) -
-                                               global_node_page_state(NR_SHMEM) -
-                                               total_swapcache_pages();
+                               global_node_page_state(NR_SHMEM) -
+                               total_swapcache_pages();
 
        if (lowmem_adj_size < array_size)
                array_size = lowmem_adj_size;