Merge tag 'sched-rt-2022-10-05' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / mm / vmstat.c

diff --git a/mm/vmstat.c b/mm/vmstat.c
index da264a040c5567d0ac192ed001134ee67e6291b7..30686e6b41459fd1fdc5e7a2cd6dd0ef53caf9c5 100644 (file)
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -355,8 +355,7 @@ void __mod_zone_page_state(struct zone *zone, enum zone_stat_item item,
         * CPU migrations and preemption potentially corrupts a counter so
         * disable preemption.
         */
-       if (IS_ENABLED(CONFIG_PREEMPT_RT))
-               preempt_disable();
+       preempt_disable_nested();
 
        x = delta + __this_cpu_read(*p);
 
@@ -368,8 +367,7 @@ void __mod_zone_page_state(struct zone *zone, enum zone_stat_item item,
        }
        __this_cpu_write(*p, x);
 
-       if (IS_ENABLED(CONFIG_PREEMPT_RT))
-               preempt_enable();
+       preempt_enable_nested();
 }
 EXPORT_SYMBOL(__mod_zone_page_state);
 
@@ -393,8 +391,7 @@ void __mod_node_page_state(struct pglist_data *pgdat, enum node_stat_item item,
        }
 
        /* See __mod_node_page_state */
-       if (IS_ENABLED(CONFIG_PREEMPT_RT))
-               preempt_disable();
+       preempt_disable_nested();
 
        x = delta + __this_cpu_read(*p);
 
@@ -406,8 +403,7 @@ void __mod_node_page_state(struct pglist_data *pgdat, enum node_stat_item item,
        }
        __this_cpu_write(*p, x);
 
-       if (IS_ENABLED(CONFIG_PREEMPT_RT))
-               preempt_enable();
+       preempt_enable_nested();
 }
 EXPORT_SYMBOL(__mod_node_page_state);
 
@@ -441,8 +437,7 @@ void __inc_zone_state(struct zone *zone, enum zone_stat_item item)
        s8 v, t;
 
        /* See __mod_node_page_state */
-       if (IS_ENABLED(CONFIG_PREEMPT_RT))
-               preempt_disable();
+       preempt_disable_nested();
 
        v = __this_cpu_inc_return(*p);
        t = __this_cpu_read(pcp->stat_threshold);
@@ -453,8 +448,7 @@ void __inc_zone_state(struct zone *zone, enum zone_stat_item item)
                __this_cpu_write(*p, -overstep);
        }
 
-       if (IS_ENABLED(CONFIG_PREEMPT_RT))
-               preempt_enable();
+       preempt_enable_nested();
 }
 
 void __inc_node_state(struct pglist_data *pgdat, enum node_stat_item item)
@@ -466,8 +460,7 @@ void __inc_node_state(struct pglist_data *pgdat, enum node_stat_item item)
        VM_WARN_ON_ONCE(vmstat_item_in_bytes(item));
 
        /* See __mod_node_page_state */
-       if (IS_ENABLED(CONFIG_PREEMPT_RT))
-               preempt_disable();
+       preempt_disable_nested();
 
        v = __this_cpu_inc_return(*p);
        t = __this_cpu_read(pcp->stat_threshold);
@@ -478,8 +471,7 @@ void __inc_node_state(struct pglist_data *pgdat, enum node_stat_item item)
                __this_cpu_write(*p, -overstep);
        }
 
-       if (IS_ENABLED(CONFIG_PREEMPT_RT))
-               preempt_enable();
+       preempt_enable_nested();
 }
 
 void __inc_zone_page_state(struct page *page, enum zone_stat_item item)
@@ -501,8 +493,7 @@ void __dec_zone_state(struct zone *zone, enum zone_stat_item item)
        s8 v, t;
 
        /* See __mod_node_page_state */
-       if (IS_ENABLED(CONFIG_PREEMPT_RT))
-               preempt_disable();
+       preempt_disable_nested();
 
        v = __this_cpu_dec_return(*p);
        t = __this_cpu_read(pcp->stat_threshold);
@@ -513,8 +504,7 @@ void __dec_zone_state(struct zone *zone, enum zone_stat_item item)
                __this_cpu_write(*p, overstep);
        }
 
-       if (IS_ENABLED(CONFIG_PREEMPT_RT))
-               preempt_enable();
+       preempt_enable_nested();
 }
 
 void __dec_node_state(struct pglist_data *pgdat, enum node_stat_item item)
@@ -526,8 +516,7 @@ void __dec_node_state(struct pglist_data *pgdat, enum node_stat_item item)
        VM_WARN_ON_ONCE(vmstat_item_in_bytes(item));
 
        /* See __mod_node_page_state */
-       if (IS_ENABLED(CONFIG_PREEMPT_RT))
-               preempt_disable();
+       preempt_disable_nested();
 
        v = __this_cpu_dec_return(*p);
        t = __this_cpu_read(pcp->stat_threshold);
@@ -538,8 +527,7 @@ void __dec_node_state(struct pglist_data *pgdat, enum node_stat_item item)
                __this_cpu_write(*p, overstep);
        }
 
-       if (IS_ENABLED(CONFIG_PREEMPT_RT))
-               preempt_enable();
+       preempt_enable_nested();
 }
 
 void __dec_zone_page_state(struct page *page, enum zone_stat_item item)