Merge branch 'akpm/master'

diff --cc fs/ext4/mballoc.c
index 1e97ac1dd4bb78756f5c93de22ee47b4b88bc49d,1e97ac1dd4bb78756f5c93de22ee47b4b88bc49d..b4da7f2a5db2d353b811c2c17e64ff7735ed6a1c
--- 1/fs/ext4/mballoc.c
--- 2/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
@@@ -3332,8 -3332,8 +3332,8 @@@ ext4_mb_check_group_pa(ext4_fsblk_t goa
                atomic_inc(&pa->pa_count);
                return pa;
        }
--      cur_distance = abs64(goal_block - cpa->pa_pstart);
--      new_distance = abs64(goal_block - pa->pa_pstart);
++      cur_distance = abs(goal_block - cpa->pa_pstart);
++      new_distance = abs(goal_block - pa->pa_pstart);
  
        if (cur_distance <= new_distance)
                return cpa;