1 files changed, 4 insertions, 11 deletions

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 2c6d5f64feca..cba2a64792e6 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -2583,30 +2583,23 @@ int __isolate_free_page(struct page *page, unsigned int order)
  * Update NUMA hit/miss statistics
  *
  * Must be called with interrupts disabled.
- *
- * When __GFP_OTHER_NODE is set assume the node of the preferred
- * zone is the local node. This is useful for daemons who allocate
- * memory on behalf of other processes.
  */
 static inline void zone_statistics(struct zone *preferred_zone, struct zone *z,
                                                                 gfp_t flags)
 {
 #ifdef CONFIG_NUMA
-        int local_nid = numa_node_id();
         enum zone_stat_item local_stat = NUMA_LOCAL;
 
-        if (unlikely(flags & __GFP_OTHER_NODE)) {
+        if (z->node != numa_node_id())
                 local_stat = NUMA_OTHER;
-                local_nid = preferred_zone->node;
-        }
 
-        if (z->node == local_nid) {
+        if (z->node == preferred_zone->node)
                 __inc_zone_state(z, NUMA_HIT);
-                __inc_zone_state(z, local_stat);
-        } else {
+        else {
                 __inc_zone_state(z, NUMA_MISS);
                 __inc_zone_state(preferred_zone, NUMA_FOREIGN);
         }
+        __inc_zone_state(z, local_stat);
 #endif
 }